Author: sflanigan
Date: 2009-03-13 00:49:17 -0400 (Fri, 13 Mar 2009)
New Revision: 14200
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
Log:
JBIDE-3557 Externalise English strings (eliminating string concatenation)
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-03-12
18:35:17 UTC (rev 14199)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-03-13
04:49:17 UTC (rev 14200)
@@ -1,5 +1,6 @@
package org.jboss.tools.smooks.utils;
+import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -19,4 +20,8 @@
return '!' + key + '!';
}
}
+
+ public static String getString(String key, Object... args) {
+ return MessageFormat.format(getString(key), args);
+ }
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-03-12
18:35:17 UTC (rev 14199)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-03-13
04:49:17 UTC (rev 14200)
@@ -42,7 +42,6 @@
import org.jboss.tools.smooks.javabean.model.SelectorAttributes;
import org.jboss.tools.smooks.javabean.ui.BeanPopulatorMappingAnalyzer;
import org.jboss.tools.smooks.model.AbstractResourceConfig;
-import org.jboss.tools.smooks.model.ParamType;
import org.jboss.tools.smooks.model.ResourceConfigType;
import org.jboss.tools.smooks.model.SmooksPackage;
import org.jboss.tools.smooks.model.SmooksResourceListType;
@@ -148,9 +147,9 @@
throw new InvocationTargetException(
new Exception(
Messages
- .getString("UIUtils.SelectorCheckErrorMessage1") + splitString
//$NON-NLS-1$
- + Messages
- .getString("UIUtils.SelectorCheckErrorMessage2") + selector +
"\"")); //$NON-NLS-1$ //$NON-NLS-2$
+ .getString("UIUtils.SelectorCheckErrorMessage", //$NON-NLS-1$
+ splitString,
+ selector)));
}
}
}
@@ -278,8 +277,8 @@
compositeCommand.setResolveDescription(Messages
.getString("UIUtils.ConnectAllConnections")); //$NON-NLS-1$
disconnectCommand.setResolveDescription(Messages
- .getString("UIUtils.DisconnectAllConnections") //$NON-NLS-1$
- + currentNode.getName() + Messages.getString("UIUtils.Node"));
//$NON-NLS-1$
+ .getString("UIUtils.DisconnectAllConnections", //$NON-NLS-1$
+ currentNode.getName()));
AbstractStructuredDataModel targetNode = UIUtils.findGraphModel(root,
currentNode);
if (targetNode instanceof IConnectableModel) {
@@ -304,12 +303,12 @@
if (tempMap.get(sourceParentNode) == null) {
JavaModelConnectionResolveCommand connectParent = new
JavaModelConnectionResolveCommand(
context);
- connectParent.setResolveDescription(Messages
- .getString("UIUtils.ConnectNode1") //$NON-NLS-1$
- + context.getSourceViewerLabelProvider().getText(
- sourceParent)
- + Messages.getString("UIUtils.ConnectNode2") //$NON-NLS-1$
- + parentNode.getName() + "\""); //$NON-NLS-1$
+ String desc = Messages
+ .getString("UIUtils.ConnectNode", //$NON-NLS-1$
+ context.getSourceViewerLabelProvider().getText(
+ sourceParent),
+ parentNode.getName());
+ connectParent.setResolveDescription(desc);
connectParent.setSourceModel(sourceParentNode);
connectParent.setTargetModel(targetParentNode);
result.addResolveCommand(connectParent);
@@ -352,12 +351,9 @@
if (((IConnectableModel) pgm)
.getModelTargetConnections().isEmpty()) {
String errorMessage = Messages
- .getString("UIUtils.ParentNodeConnectErrorMessage1") //$NON-NLS-1$
- + javaModel.getName()
- + "\" : \"" //$NON-NLS-1$
- + parent.getName()
- + Messages
- .getString("UIUtils.ParentNodeConnectErrorMessage2"); //$NON-NLS-1$
+ .getString("UIUtils.ParentNodeConnectErrorMessage", //$NON-NLS-1$
+ javaModel.getName(),
+ parent.getName());
DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult();
dr.setErrorMessage(errorMessage);
createJavaModelConnectionErrorResolveCommand(dr,
@@ -402,17 +398,15 @@
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
.setErrorMessage(Messages
- .getString("UIUtils.InstanceLoadedErrorMessage1") //$NON-NLS-1$
- + ((JavaBeanModel) refObj).getName()
- + Messages
- .getString("UIUtils.InstanceLoadedErrorMessage2") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.InstanceLoadedErrorMessage", //$NON-NLS-1$
+ ((JavaBeanModel) refObj).getName(),
+ instanceName));
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
command
.setResolveDescription(Messages
- .getString("UIUtils.InstanceLoadedResolveMessage1") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.InstanceLoadedResolveMessage", //$NON-NLS-1$
+ instanceName));
command.setInstanceName(instanceName);
command.setJavaBean((JavaBeanModel) refObj);
result.addResolveCommand(command);
@@ -422,11 +416,9 @@
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
.setErrorMessage(Messages
- .getString("UIUtils.JavaModelLoadedErrorMessage1") //$NON-NLS-1$
- + ((JavaBeanModel) refObj).getName()
- + Messages
- .getString("UIUtils.JavaModelLoadedErrorMessage2") //$NON-NLS-1$
- + instanceName + "\""); //$NON-NLS-1$
+ .getString("UIUtils.JavaModelLoadedErrorMessage", //$NON-NLS-1$
+ ((JavaBeanModel) refObj).getName(),
+ instanceName));
if (List.class.isAssignableFrom(instanceClazz)) {
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-03-12
18:35:17 UTC (rev 14199)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-03-13
04:49:17 UTC (rev 14200)
@@ -1,19 +1,10 @@
-# START NON-TRANSLATABLE
-# FIXME translation disabled until the concatenation is eliminated
UIUtils.ConnectAllConnections=Make all necessary connections
-UIUtils.ConnectNode1=Connect the "
-UIUtils.ConnectNode2=" to the "
-UIUtils.DisconnectAllConnections=Disconnect all connections of the current "
+UIUtils.ConnectNode=Connect the "{0}" to the "{1}"
+UIUtils.DisconnectAllConnections=Disconnect all connections of the current
"{0}"node
UIUtils.InstanceClassResolveMessage1=Change the instance class to
"java.util.ArrayList"
UIUtils.InstanceClassResolveMessage2=java.util.ArrayList
-UIUtils.InstanceLoadedErrorMessage1=The instance class of "
-UIUtils.InstanceLoadedErrorMessage2=" can not be loaded. The instance name is
"
-UIUtils.InstanceLoadedResolveMessage1=Change the instance class to "
-UIUtils.JavaModelLoadedErrorMessage1=Java model "
-UIUtils.JavaModelLoadedErrorMessage2=" can not be instantiated. The instance name is
"
-UIUtils.Node="node
-UIUtils.ParentNodeConnectErrorMessage1=The parent of Java node "
-UIUtils.ParentNodeConnectErrorMessage2=" is not connected to any source node
-UIUtils.SelectorCheckErrorMessage1=The Selector string does not support "
-UIUtils.SelectorCheckErrorMessage2=" character. Selector is "
-# END NON-TRANSLATABLE
+UIUtils.InstanceLoadedErrorMessage=The instance class of "{0}" can not be
loaded. The instance name is "{1}"
+UIUtils.InstanceLoadedResolveMessage=Change the instance class to "{0}"
+UIUtils.JavaModelLoadedErrorMessage=Java model "{0}" can not be instantiated.
The instance name is "{1}"
+UIUtils.ParentNodeConnectErrorMessage=The parent of Java node "{0}" :
"{1}" is not connected to any source node
+UIUtils.SelectorCheckErrorMessage=The Selector string does not support "{0}"
character. Selector is "{1}"