Author: scabanovich Date: 2012-04-05 18:08:32 -0400 (Thu, 05 Apr 2012) New Revision: 40082 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties 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/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -37,12 +37,19 @@ public void check(XModelObject object) { } + @Deprecated protected void fireMessage(XModelObject object, String message) { ITextSourceReference ref = getSourceReference(object, attr); IMarker m = manager.addError(message, preference, ref, ref.getResource()); bindMarkerToPathAndAttribute(m, object, attr); } + protected void fireMessage(XModelObject object, String message, String... messageArguments) { + ITextSourceReference ref = getSourceReference(object, attr); + IMarker m = manager.addError(message, preference, messageArguments, ref, ref.getResource()); + bindMarkerToPathAndAttribute(m, object, attr); + } + ITextSourceReference getSourceReference(XModelObject o, String attr) { return new XMLValueInfo(o, attr); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -15,7 +15,6 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.log.LogHelper; import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintQClassName; import org.jboss.tools.common.model.XModelObject; @@ -180,17 +179,17 @@ } protected void fireImplements(XModelObject object, String id, String value, String interfaceName) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_IMPLEMENTS, new Object[] {visualAttr, value, interfaceName})); + fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_IMPLEMENTS, visualAttr, value, interfaceName); } protected void fireExtends(XModelObject object, String id, String value, String superName) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXTENDS, new Object[] {visualAttr, value, superName})); + fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_EXTENDS, visualAttr, value, superName); } protected void fireInvalid(XModelObject object, String id, String value) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_VALID, visualAttr, value)); + fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_VALID, visualAttr, value); } protected void fireNotExist(XModelObject object, String id, String value) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXISTS, visualAttr, value)); + fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_EXISTS, visualAttr, value); } public static IType getValidType(String className, XModelObject o) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jst.web.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -29,9 +28,9 @@ String filterName = object.getAttributeValue(ATTR); if(filterName == null) return; if(filterName.length() == 0) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, ATTR)); + fireMessage(object, WebXMLValidatorMessages.EMPTY, ATTR); } else if(findFilter(object, filterName) == null) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.FILTER_NOT_EXISTS, ATTR, filterName)); + fireMessage(object, WebXMLValidatorMessages.FILTER_NOT_EXISTS, ATTR, filterName); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -13,7 +13,6 @@ import java.util.List; 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.filesystems.FileSystemsHelper; @@ -112,12 +111,12 @@ } protected void fireEmpty(XModelObject object, String id, String attr) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.PATH_EMPTY, attr)); + fireMessage(object, WebXMLValidatorMessages.PATH_EMPTY, attr); } protected void fireExists(XModelObject object, String id, String attr, String value) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.PATH_NOT_EXISTS, attr, value)); + fireMessage(object, WebXMLValidatorMessages.PATH_NOT_EXISTS, attr, value); } protected void fireExtension(XModelObject object, String id, String attr, String value) { - fireMessage(object, NLS.bind(extensionMessage, attr, value)); + fireMessage(object, extensionMessage, attr, value); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jst.web.validation; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -29,9 +28,9 @@ String roleName = object.getAttributeValue(attr); if(roleName == null) return; if(roleName.length() == 0) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, attr)); + fireMessage(object, WebXMLValidatorMessages.EMPTY, attr); } else if(!isRoleNameOk(object, roleName)) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.ROLE_NOT_EXISTS, attr, roleName)); + fireMessage(object, WebXMLValidatorMessages.ROLE_NOT_EXISTS, attr, roleName); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-04-05 22:08:32 UTC (rev 40082) @@ -12,7 +12,6 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.jst.web.WebModelPlugin; @@ -37,7 +36,7 @@ if(servletName == null) return; if(servletName.length() == 0) { if(acceptEmpty) return; - fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, attr)); + fireMessage(object, WebXMLValidatorMessages.EMPTY, attr); } else if(findServlet(object, servletName) == null) { //JAX-RS if(servletName.equals(JAX_RS_APPLICATION)) { @@ -51,7 +50,7 @@ WebModelPlugin.getDefault().logError(e); } } else { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName)); + fireMessage(object, WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName); } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties 2012-04-05 22:03:59 UTC (rev 40081) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties 2012-04-05 22:08:32 UTC (rev 40082) @@ -3,15 +3,15 @@ VALIDATING_PROJECT=project "{0}" PATH_EMPTY={0} is empty -PATH_NOT_EXISTS={0} references to {1} that does not exist in web content -PATH_NOT_TAGLIB={0} references to {1} that is not tag library -PATH_NOT_ICON={0} references to {1} that is not an icon file -PATH_NOT_PAGE={0} references to {1} that is not a page file -CLASS_NOT_EXISTS={0} references to non-existent class {1} -CLASS_NOT_IMPLEMENTS={0} references to {1} that does not implement interface {2} -CLASS_NOT_EXTENDS={0} references to {1} that does not extend {2} +PATH_NOT_EXISTS={0} references to "{1}" that does not exist in web content +PATH_NOT_TAGLIB={0} references to "{1}" that is not tag library +PATH_NOT_ICON={0} references to "{1}" that is not an icon file +PATH_NOT_PAGE={0} references to "{1}" that is not a page file +CLASS_NOT_EXISTS={0} references to non-existent class "{1}" +CLASS_NOT_IMPLEMENTS={0} references to "{1}" that does not implement interface {2} +CLASS_NOT_EXTENDS={0} references to "{1}" that does not extend {2} CLASS_NOT_VALID={0} must be valid fully qualified class name EMPTY=Attribute {0} is empty -SERVLET_NOT_EXISTS={0} references to {1} that is not a servlet -FILTER_NOT_EXISTS={0} references to {1} that is not a filter -ROLE_NOT_EXISTS={0} references to {1} that is not a role +SERVLET_NOT_EXISTS={0} references to "{1}" that is not a servlet +FILTER_NOT_EXISTS={0} references to "{1}" that is not a filter +ROLE_NOT_EXISTS={0} references to "{1}" that is not a role