Document name is generated now for new documents during checkin. Unit test is updated...

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / OpenStudy.java

diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
index 256f84cf4ceb5501d5fd727a8dc1dbece1eaacb5..82dcc0efa6daa9bed44b5889b71acaa29405bfdf 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
@@ -97,8 +97,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
        public OpenStudy open(final User user, final Study study) {
                ResourceBundle custom = ResourceBundle.getBundle("som",
                                getApplicationSettings().getCurrentLocale());
-               SimpleDateFormat datstring = new SimpleDateFormat(custom
-                               .getString("date.format"));
+               SimpleDateFormat datstring = new SimpleDateFormat(
+                               custom.getString("date.format"));
                Revision.Format verstring = new Revision.Format(getProjectSettings()
                                .getRevisionPattern());
 
@@ -204,9 +204,10 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
        }
 
        public String getType() {
-               return ResourceBundle.getBundle("labels",
-                               getApplicationSettings().getCurrentLocale()).getString(
-                               "label.study");
+               /*
+                * RKV: return ResourceBundle.getBundle("labels", getApplicationSettings().getCurrentLocale()).getString( "label.study");
+                */
+               return "study";
        }
 
        public String getVersion() {
@@ -256,8 +257,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
                        // Transfer to the document of all known properties
                        ResourceBundle locale = ResourceBundle.getBundle("som",
                                        getApplicationSettings().getCurrentLocale());
-                       SimpleDateFormat get = new SimpleDateFormat(locale
-                                       .getString("date.format"));
+                       SimpleDateFormat get = new SimpleDateFormat(
+                                       locale.getString("date.format"));
                        Writer tool = Toolbox.getWriter(credoc);
                        List<Step> slist = getInvolvedSteps();
                        for (Iterator<Step> i = slist.iterator(); i.hasNext();) {
@@ -266,14 +267,15 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
                                for (Iterator<SimulationContext> j = clist.iterator(); j
                                                .hasNext();) {
                                        SimulationContext context = j.next();
-                                       tool.updateProperty(context.getType().getName(), context
-                                                       .getValue());
+                                       tool.updateProperty(context.getType().getName(),
+                                                       context.getValue());
                                }
                        }
                        tool.updateProperty("reference", medoc.getReference());
                        tool.updateProperty("study", _mystudy.getTitle());
-                       tool.updateProperty("step", locale.getString(
-                                       "folder.step." + step.getNumber()).replaceAll("''", "'"));
+                       tool.updateProperty("step",
+                                       locale.getString("folder.step." + step.getNumber())
+                                                       .replaceAll("''", "'"));
                        tool.updateProperty("author", author.getUsername().toUpperCase());
                        tool.updateProperty("date", get.format(medoc.getCreationDate()));
                        tool.updateProperty("history", locale.getString("label.creation")
@@ -343,8 +345,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
        }
 
        protected void add(final KnowledgeElement kelm) {
-               KnowledgeElementFacade facade = new KnowledgeElementFacade(BeanHelper
-                               .copyBean(kelm, KnowledgeElementDTO.class),
+               KnowledgeElementFacade facade = new KnowledgeElementFacade(
+                               BeanHelper.copyBean(kelm, KnowledgeElementDTO.class),
                                getApplicationSettings());
                // RKV KnowledgeIterator known = knowledge.get(kelm.getType().getIndex() - 2);
                // Knowledges are ordered by type index, from 0 to n-1, the first one being reserved (reason for -2)