Author: bfitzpat
Date: 2010-02-01 11:24:38 -0500 (Mon, 01 Feb 2010)
New Revision: 20055
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
Log:
OPEN - issue JBIDE-5774: Externalize strings in org.jboss.tools.smooks.core and .ui
https://jira.jboss.org/jira/browse/JBIDE-5774
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -129,7 +129,7 @@
*/
public CountDirection createCountDirectionFromString(EDataType eDataType, String
initialValue) {
CountDirection result = CountDirection.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.CalcFactoryImpl_Error_Invalid_Enumerator + initialValue
+ Messages.CalcFactoryImpl_Error_Invalid_Enumerator2 + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
//$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.CalcFactoryImpl_Error_Invalid_Enumerator + initialValue
+ Messages.CalcFactoryImpl_Error_Invalid_Enumerator2 + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
//$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -184,7 +184,7 @@
*/
public InlineDirective createInlineDirectiveFromString(EDataType eDataType, String
initialValue) {
InlineDirective result = InlineDirective.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.FreemarkerFactoryImpl_Error_Value_Not_Valid +
initialValue + Messages.FreemarkerFactoryImpl_Error_Not_Valid_Enumerator +
eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
//$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.FreemarkerFactoryImpl_Error_Value_Not_Valid +
initialValue + Messages.FreemarkerFactoryImpl_Error_Not_Valid_Enumerator +
eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
//$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -209,7 +209,7 @@
*/
public AcknowledgeMode createAcknowledgeModeFromString(EDataType eDataType, String
initialValue) {
AcknowledgeMode result = AcknowledgeMode.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -229,7 +229,7 @@
*/
public DeliveryMode createDeliveryModeFromString(EDataType eDataType, String
initialValue) {
DeliveryMode result = DeliveryMode.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -249,7 +249,7 @@
*/
public MessageType createMessageTypeFromString(EDataType eDataType, String initialValue)
{
MessageType result = MessageType.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue +
Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -197,7 +197,7 @@
*/
public AcknowledgeMode createAcknowledgeModeFromString(EDataType eDataType, String
initialValue) {
AcknowledgeMode result = AcknowledgeMode.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -217,7 +217,7 @@
*/
public DeliveryMode createDeliveryModeFromString(EDataType eDataType, String
initialValue) {
DeliveryMode result = DeliveryMode.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -237,7 +237,7 @@
*/
public MessageType createMessageTypeFromString(EDataType eDataType, String initialValue)
{
MessageType result = MessageType.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue +
Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -233,7 +233,7 @@
*/
public OnNoResult createOnNoResultFromString(EDataType eDataType, String initialValue)
{
OnNoResult result = OnNoResult.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue +
Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue +
Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -253,7 +253,7 @@
*/
public ParameterType createParameterTypeFromString(EDataType eDataType, String
initialValue) {
ParameterType result = ParameterType.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue +
Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue +
Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() +
"'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -126,7 +126,7 @@
*/
public OnFail createOnFailFromString(EDataType eDataType, String initialValue) {
OnFail result = OnFail.get(initialValue);
- if (result == null) throw new
IllegalArgumentException(Messages.Validation10FactoryImpl_Error_Value_Not_Valid +
initialValue + Messages.Validation10FactoryImpl_Error_Not_Valid_Enumerator +
eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new
IllegalArgumentException(Messages.Validation10FactoryImpl_Error_Value_Not_Valid +
initialValue + Messages.Validation10FactoryImpl_Error_Not_Valid_Enumerator +
eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-02-01
16:15:50 UTC (rev 20054)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-02-01
16:24:38 UTC (rev 20055)
@@ -56,15 +56,15 @@
public static final String KEY_OBJECT_ID = "id"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE = "modelSrcType";
+ public static final String KEY_XML_FILE_TYPE = "modelSrcType"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_PATH = "modelSrc";
+ public static final String KEY_XML_FILE_PATH = "modelSrc"; //$NON-NLS-1$
- public static final String KEY_XML_ROOT_NAME = "rootElementName";
+ public static final String KEY_XML_ROOT_NAME = "rootElementName";
//$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE_XSD = "XSD";
+ public static final String KEY_XML_FILE_TYPE_XSD = "XSD"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE_XML = "XML";
+ public static final String KEY_XML_FILE_TYPE_XML = "XML"; //$NON-NLS-1$
public static final String KEY_CSV_SEPERATOR = "seperator"; //$NON-NLS-1$
@@ -618,7 +618,7 @@
if (typeParam != null) {
String value = typeParam.getStringValue();
if (value != null) {
- return value.equals("true");
+ return value.equals("true"); //$NON-NLS-1$
}
}