From: rkv <rkv@opencascade.com>
Date: Mon, 6 May 2013 08:12:35 +0000 (+0000)
Subject: ISR fix: titlebar study and knowledge type localization fix
X-Git-Tag: Delivery_V1_0_2013_07_12~34
X-Git-Url: http://git.salome-platform.org/gitweb/?p=tools%2Fsiman.git;a=commitdiff_plain;h=2588c47a9aa7a8ed827b0c2a43791f68573e1a41

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 a7888b3..11a98e5 100644
--- 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 ae445b9..1fad257 100644
--- 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 fc28242..1c6ae7a 100644
--- 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 e983036..46d1085 100644
--- 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");
 	}