Author: sflanigan
Date: 2009-04-06 02:25:14 -0400 (Mon, 06 Apr 2009)
New Revision: 14512
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIMessages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/jee/ClasspathContainerPage.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
Log:
JBIDE-3557 Externalise English strings (eliminating string concatenation)
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIMessages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIMessages.properties 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIMessages.properties 2009-04-06
06:25:14 UTC (rev 14512)
@@ -1,6 +1,5 @@
-jeeClasspathAdding=Adding
-jeeClasspathBody1=Click finish to continue adding
-jeeClasspathBody2= to your project's classpath.
+jeeClasspathAdding=Adding {0}
+jeeClasspathBody=Click finish to continue adding {0} to your project's classpath.
jeeClasspathDescription=These libraries include the API and Source for the chosen JEE
version.
ejb3ClasspathPageTitle=JBoss EJB 3.0 Libraries
ejb3ClasspathPageDescription=Add EJB 3.0 Libraries from one of the declared servers.
\ No newline at end of file
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java 2009-04-06
06:25:14 UTC (rev 14512)
@@ -34,7 +34,7 @@
public class ClasspathUIPlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID =
"org.jboss.ide.eclipse.as.classpath.ui";
+ public static final String PLUGIN_ID =
"org.jboss.ide.eclipse.as.classpath.ui"; //$NON-NLS-1$
// The shared instance
private static ClasspathUIPlugin plugin;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java 2009-04-06
06:25:14 UTC (rev 14512)
@@ -25,12 +25,11 @@
public class Messages {
public static String jeeClasspathAdding;
- public static String jeeClasspathBody1;
- public static String jeeClasspathBody2;
+ public static String jeeClasspathBody;
public static String jeeClasspathDescription;
public static String ejb3ClasspathPageTitle;
public static String ejb3ClasspathPageDescription;
static {
- NLS.initializeMessages(ClasspathUIPlugin.PLUGIN_ID + ".ClasspathUIMessages",
Messages.class);
+ NLS.initializeMessages(ClasspathUIPlugin.PLUGIN_ID + ".ClasspathUIMessages",
Messages.class); //$NON-NLS-1$
}
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/jee/ClasspathContainerPage.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/jee/ClasspathContainerPage.java 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/jee/ClasspathContainerPage.java 2009-04-06
06:25:14 UTC (rev 14512)
@@ -27,6 +27,7 @@
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -50,7 +51,7 @@
super(PAGE_NAME);
this.containerId = id;
this.description = description;
- this.setTitle(Messages.jeeClasspathAdding + description);
+ this.setTitle(NLS.bind(Messages.jeeClasspathAdding, description));
this.setDescription(Messages.jeeClasspathDescription);
this.setImageDescriptor(JavaPluginImages.DESC_WIZBAN_ADD_LIBRARY);
}
@@ -67,9 +68,8 @@
top.setLayout(layout);
Label lbl = new Label(top, SWT.NONE);
- lbl.setText(Messages.jeeClasspathBody1 +
- this.getClasspathEntryDescription() +
- Messages.jeeClasspathBody2);
+ lbl.setText(NLS.bind(Messages.jeeClasspathBody,
+ this.getClasspathEntryDescription()));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
lbl.setLayoutData(gd);
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-04-06
06:25:14 UTC (rev 14512)
@@ -15,8 +15,8 @@
JBoss_Runtime_List_Field_Editor_Modify_Runtime=Input new values
JBoss_Runtime_List_Field_Editor_New_Runtime=New JBoss ESB Runtime
Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBoss
ESB runtime home directory cannot be empty
-JBoss_Runtime_List_Field_Editor_Already_Exists=' already exists
-JBoss_Runtime_List_Field_Editor_Runtime=JBoss ESB Runtime
+JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists=JBoss ESB Runtime
''{0}'' already exists
+JBoss_Runtime_List_Field_Editor_Runtime=JBoss ESB Runtime
Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct=Runtime name is not
correct
Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty=Name cannot be empty
Error_JBoss_Runtime_List_Field_Editor_Version_Cannot_Be_Empty=Version cannot be empty
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUIMessages.java 2009-04-06
06:25:14 UTC (rev 14512)
@@ -42,7 +42,7 @@
public static String JBoss_Runtime_List_Field_Editor_Modify_Runtime;
public static String JBoss_Runtime_List_Field_Editor_New_Runtime;
public static String
Error_JBoss_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty;
- public static String JBoss_Runtime_List_Field_Editor_Already_Exists;
+ public static String JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists;
public static String JBoss_Runtime_List_Field_Editor_Runtime;
public static String Error_JBoss_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct;
public static String Error_JBoss_Runtime_List_Field_Editor_Name_Cannot_Be_Empty;
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-04-06
00:52:28 UTC (rev 14511)
+++
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-04-06
06:25:14 UTC (rev 14512)
@@ -518,9 +518,9 @@
continue;
}
if (rt.getName().equals(name.getValueAsString())) {
- setErrorMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime
- + name.getValueAsString()
- + JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Already_Exists);
+ setErrorMessage(NLS.bind(
+ JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Runtime_Already_Exists,
+ name.getValueAsString()));
setPageComplete(false);
return;
}
Show replies by date