(refs #7358) Initial 4.7 update commit

[simantics/platform.git] / bundles / org.simantics.workbench / src / org / simantics / workbench / internal / SimanticsWorkbenchWindowAdvisor.java

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java
index 74abd0c35e47d89bca18b3f53da5862f7aeca63a..a6a802052d7ec9145f8d958ad72581f820cf296a 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchWindowAdvisor.java
@@ -517,7 +517,8 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
         if (currentPage != null) {
             if (activeEditor != null) {
                 lastEditorTitle = activeEditor.getTitleToolTip();
-                title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, lastEditorTitle, title);
+                //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+                title = NLS.bind("{0} - {1}", lastEditorTitle, title);
             }
 
             boolean excludePerspectiveFromTitle = "true".equals(System.getProperty("org.simantics.workbench.application.excludePerspectiveFromTitle", "false").toLowerCase());
@@ -532,14 +533,15 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
                     label = currentPage.getLabel();
                 }
                 if (label != null && !label.equals("")) { //$NON-NLS-1$
-                    title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, label, title);
+                       //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+                    title = NLS.bind("{0} - {1}", label, title);
                 }
             }
         }
 
         String workspaceLocation = wbAdvisor.getWorkspaceLocation();
         if (workspaceLocation != null) {
-            title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle, title, workspaceLocation);
+            title = NLS.bind("{0} - {1}", title, workspaceLocation);
         }
 
         // Bug 284447: Prepend workspace name to the title
@@ -547,8 +549,8 @@ public class SimanticsWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
         .getPreferenceStore().getString(
                 IDEInternalPreferences.WORKSPACE_NAME);
         if (workspaceName != null && workspaceName.length() > 0) {
-            title = NLS.bind(IDEWorkbenchMessages.WorkbenchWindow_shellTitle,
-                    workspaceName, title);
+               //IDEWorkbenchMessages.WorkbenchWindow_shellTitle == "{0} - {1}"
+            title = NLS.bind("{0} - {1}", workspaceName, title);
         }
 
         return title;