[jbosstools-commits] JBoss Tools SVN: r38209 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

Author: yradtsevich Date: 2012-01-26 13:14:15 -0500 (Thu, 26 Jan 2012) New Revision: 38209 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java Log: https://issues.jboss.org/browse/JBIDE-9025 : Substituted EL variable is not properly evaulated - fixed the issue Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java 2012-01-26 18:13:41 UTC (rev 38208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java 2012-01-26 18:14:15 UTC (rev 38209) @@ -190,19 +190,22 @@ public String replaceElAndResources(String value) { String rst = value; - rst = ResourceUtil.getBundleValue(pageContext, value); + rst = ResourceUtil.getBundleValue(pageContext, rst); + rst = replaceEl(rst); + // replace custom attributes rst = replaceCustomAttributes(rst); - if (Jsf2ResourceUtil.isExternalContextPathString(value)) { - rst = Jsf2ResourceUtil.processExternalContextPath(value); + + if (Jsf2ResourceUtil.isExternalContextPathString(rst)) { + rst = Jsf2ResourceUtil.processExternalContextPath(rst); } - if (Jsf2ResourceUtil.isRequestContextPathString(value)) { - rst = Jsf2ResourceUtil.processRequestContextPath(value); + if (Jsf2ResourceUtil.isRequestContextPathString(rst)) { + rst = Jsf2ResourceUtil.processRequestContextPath(rst); } if (Jsf2ResourceUtil.isJSF2ResourceString(rst)) { rst = Jsf2ResourceUtil.processCustomJSFAttributes(pageContext, rst); } - rst = replaceEl(rst); + return rst; }