Author: scabanovich Date: 2012-04-05 18:09:14 -0400 (Thu, 05 Apr 2012) New Revision: 40083 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java Log: JBIDE-11494 https://issues.jboss.org/browse/JBIDE-11494 In validators, do not use NLS before passing message to addError, because it is considered as pattern and may cause parse errors. Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -169,10 +169,9 @@ this.attr = attr; String oTitle = DefaultCreateHandler.title(object, true); String pTitle = DefaultCreateHandler.title(object.getParent(), true); - Object[] os = (info == null) ? new Object[] {oTitle, pTitle} - : new Object[] {oTitle, pTitle, info}; - String message = NLS.bind(id, os); - fireMessage(object, message); + String[] os = (info == null) ? new String[] {oTitle, pTitle} + : new String[] {oTitle, pTitle, info}; + fireMessage(object, id, os); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; @@ -32,15 +31,13 @@ if (name.length() == 0) { String valid = (String)object.getAttributeValue("validate"); if ("yes".equals(valid) || "true".equals(valid)) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_NAME_EMPTY, new Object[] {DefaultCreateHandler.title(object, true)}); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.ACTION_NAME_EMPTY, DefaultCreateHandler.title(object, true)); } } else { XModelObject bean = object.getParent().getParent() .getChildByPath("form-beans").getChildByPath(name); if (bean == null) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_NAME_EXISTS, new Object[] {DefaultCreateHandler.title(object, true), name}); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.ACTION_NAME_EXISTS, DefaultCreateHandler.title(object, true), name); } } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -12,7 +12,6 @@ import java.util.*; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.*; @@ -121,9 +120,7 @@ } protected void fire(String id, String attr, String value) { - Object[] os = new Object[] {DefaultCreateHandler.title(object, true), value}; - String message = NLS.bind(id, os); - fireMessage(object, message); + fireMessage(object, id, DefaultCreateHandler.title(object, true), value); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; @@ -37,18 +36,14 @@ int tvr = tv.checkClass(object, "type", sup); String oTitle = DefaultCreateHandler.title(object, true); if(tvr == ValidateTypeUtil.EMPTY) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EMPTY, oTitle); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EMPTY, oTitle); } else if(tvr == ValidateTypeUtil.NOT_FOUND) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EXISTS, new Object[] {oTitle, type}); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EXISTS, oTitle, type); } else if(tvr == ValidateTypeUtil.WRONG_SUPER) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EXTENDS, new Object[] {oTitle, type, sup}); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EXTENDS, oTitle, type, sup); } else if(tvr == ValidateTypeUtil.NOT_UPTODATE) { - String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_UPTODATE, new Object[] {oTitle, type}); - fireMessage(object, message); - } + fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_UPTODATE, oTitle, type); + } } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -12,7 +12,6 @@ import java.util.StringTokenizer; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.XModelImpl; @@ -46,17 +45,14 @@ if(path.length() == 0) continue; XModelObject fc = XModelImpl.getByRelativePath(model, path); if(fc == null) { - String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, path); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, path); } String path2 = path.startsWith("/") ? path.substring(1) : path; XModelObject fc2 = webRoot.getChildByPath(path2); if(fc2 == null) { - String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, path); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, path); } else if(!fc2.getModelEntity().getName().startsWith("StrutsConfig")) { - String message = NLS.bind(StrutsValidatorMessages.CONFIG_VALID, "param-value", path); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.CONFIG_VALID, "param-value", path); } } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; @@ -33,9 +32,8 @@ protected void fire(String id, String attr, String info) { this.attr = attr; String oTitle = DefaultCreateHandler.title(object, true); - Object[] os = (info == null) ? new Object[] {oTitle} - : new Object[] {oTitle, info}; - String message = NLS.bind(id, os); - fireMessage(object, message); + String[] os = (info == null) ? new String[] {oTitle} + : new String[] {oTitle, info}; + fireMessage(object, id, os); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.struts.model.handlers.OpenMessageResourcesHandler; @@ -19,14 +18,13 @@ public ResourceCheck(ValidationErrorManager manager, String preference) { super(manager, preference); - attr = "parameter"; + attr = "parameter"; //$NON-NLS-1$ } public void check(XModelObject object) { this.object = object; if(!OpenMessageResourcesHandler.isReferencingResourceObject(object)) return; if(OpenMessageResourcesHandler.getResourceObject(object) != null) return; - String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, object.getAttributeValue("parameter")); - fireMessage(object, message); + fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, object.getAttributeValue("parameter")); //$NON-NLS-1$ } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; @@ -28,9 +27,8 @@ AbstractWebFileImpl f = (AbstractWebFileImpl)object; if(!f.isIncorrect()) return; String oTitle = DefaultCreateHandler.title(object, true); - String errors = "\n" + f.get("errors"); - String message = NLS.bind(StrutsValidatorMessages.CONFIG_VALID, oTitle, errors); - fireMessage(object, message); + String errors = "\n" + f.get("errors"); //$NON-NLS-1$ //$NON-NLS-2$ + fireMessage(object, StrutsValidatorMessages.CONFIG_VALID, oTitle, errors); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java 2012-04-05 22:08:32 UTC (rev 40082) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java 2012-04-05 22:09:14 UTC (rev 40083) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.struts.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.validation.ValidationErrorManager; @@ -47,9 +46,7 @@ this.attr = attr; String oTitle = DefaultCreateHandler.title(object, true); String pTitle = DefaultCreateHandler.title(object.getParent(), true); - Object[] os = new Object[] {oTitle, pTitle}; - String message = NLS.bind(id, os); - fireMessage(object, message); + fireMessage(object, id, oTitle, pTitle); } }