Author: mareshkau Date: 2011-02-07 08:13:28 -0500 (Mon, 07 Feb 2011) New Revision: 29045 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java Log: https://issues.jboss.org/browse/JBIDE-7005, refactoring our jsf 2 validators. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java 2011-02-07 13:09:16 UTC (rev 29044) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java 2011-02-07 13:13:28 UTC (rev 29045) @@ -21,6 +21,8 @@ * */ public class BundleMapUtil { + + private static final String elPattern = "(?s:(.*)[#\\$]\\{(.+)\\}(.*))"; //$NON-NLS-1$ /** * Checks if node contains text information from resource bundle * @param pageContext @@ -32,7 +34,6 @@ return rst; } - /** * @param pageContext * @param sourceNode @@ -84,6 +85,6 @@ * @return */ public static boolean isContainsEl(final String value) { - return (value.contains("#{") || value.contains("${")); //$NON-NLS-1$//$NON-NLS-2$ + return value.matches(elPattern); } }