ISR fix: titlebar study and knowledge type localization fix

diff --git a/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java b/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java
index a7888b3b4e916d97d151d7623e84d936ee83efa6..11a98e5ec3434423ecc05895a965ac3ea4e3fbfe 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java
+++ b/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java
@@ -345,6 +345,13 @@ public abstract class AbstractOpenObject implements Proxy {
                        _contents = null;
                }
        }
+       
+       /**
+        * Returns localized name of the type of the object represented by this proxy.
+        * 
+        * @return localized name of the type of the object represented by this proxy.
+        */
+       public abstract String getTypeName();
 
        /**
         * Get project settings.

diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index ae445b9e88166e32f2d6b495b7adb02986286d08..1fad2570a083121ad81e774e4ac5a21b05da8509 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -419,7 +419,7 @@ public class Action extends ActionSupport implements ServletRequestAware,
                                        entity.getProgressState().toString());
                        getTitleBarSettings().setSelectionState(entity.getSelection());
                        getTitleBarSettings().setEntryType(entity.getType().toLowerCase());
-                       getTitleBarSettings().setEntryTypeTitle(entity.getType());
+                       getTitleBarSettings().setEntryTypeTitle(entity.getTypeName());
                        getTitleBarSettings().setEntryTitle(entity.getTitle());
                }
                getTitleBarSettings().setEditDisabledProperty(editDisabledProperty);

diff --git a/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java b/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java
index fc28242ea08c11f2b809efab93bf63dbf417ed04..1c6ae7a0f64642b347759edfa5cda7cfcd79f768 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java
@@ -159,6 +159,11 @@ public class OpenKnowledge extends AbstractOpenObject {
                return "knowledge";
        }
        
+       /** 
+        * {@inheritDoc}
+        * @see org.splat.simer.AbstractOpenObject#getTypeName()
+        */
+       @Override
        public String getTypeName() {
                return ResourceBundle.getBundle("som", getApplicationSettings()
                                .getCurrentLocale()).getString( "type.knowledge." + _myknelm.getType().getName());

diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
index e98303607e944d95593521a4d6c0ae1ffa6ccabf..46d1085395bc5639bc5711ea4e8bcf2a947ba506 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
@@ -342,6 +342,11 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
                return Constants.STUDY_MENU;
        }
        
+       /** 
+        * {@inheritDoc}
+        * @see org.splat.simer.AbstractOpenObject#getTypeName()
+        */
+       @Override
        public String getTypeName() {
                return ResourceBundle.getBundle("labels", getApplicationSettings().getCurrentLocale()).getString( "label.study");
        }