Author: estherbin Date: 2008-08-06 06:38:21 -0400 (Wed, 06 Aug 2008) New Revision: 9561 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java Log: Move test cases from *.vpe.test to the vpe.ui.test package. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-08-06 09:44:17 UTC (rev 9560) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-08-06 10:38:21 UTC (rev 9561) @@ -84,14 +84,14 @@ if (outputAttr != null) { // prepare value - String newValue = outputAttr.getValue(); + String newValue = prepareAttrValue(pageContext, sourceElement, outputAttr); // if escape then contents of value (or other attribute) is only // text if (!sourceElement.hasAttribute(JSF.ATTR_ESCAPE) || "true".equalsIgnoreCase(sourceElement //$NON-NLS-1$ .getAttribute(JSF.ATTR_ESCAPE))) { - String value = outputAttr.getNodeValue(); + String value = outputAttr.getValue(); nsIDOMText text; // if bundleValue differ from value then will be represent @@ -224,4 +224,10 @@ } return node; } + + protected String prepareAttrValue(VpePageContext pageContext, + Element parent, Attr attr) { + + return attr.getNodeValue(); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2008-08-06 09:44:17 UTC (rev 9560) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2008-08-06 10:38:21 UTC (rev 9561) @@ -96,6 +96,14 @@ return true; } + @Override + protected String prepareAttrValue(VpePageContext pageContext, + Element parent, Attr attr) { + String newString = prepareAttrValueByParams(attr.getNodeValue(), + getParams(parent)); + + return newString; + } /** * find message format elements and update value