[jbosstools-commits] JBoss Tools SVN: r9404 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.

Author: estherbin Date: 2008-07-29 12:50:37 -0400 (Tue, 29 Jul 2008) New Revision: 9404 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/JsfOptionSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java Log: Implements https://jira.jboss.org/jira/browse/JBIDE-2582 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-07-29 16:49:34 UTC (rev 9403) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-07-29 16:50:37 UTC (rev 9404) @@ -74,9 +74,7 @@ if (outputAttr != null) { // prepare value - String newValue = prepareAttrValue(pageContext, sourceElement, - outputAttr); - + String newValue = outputAttr.getValue(); // if escape then contents of value (or other attribute) is only // text if (!sourceElement.hasAttribute(JSF.ATTR_ESCAPE) @@ -134,13 +132,14 @@ creationData.setElementData(elementData); } + + @Deprecated +// protected String prepareAttrValue(VpePageContext pageContext, +// Element parent, Attr attr) { +// +// return ComponentUtil.getBundleValue(pageContext, attr); +// } - protected String prepareAttrValue(VpePageContext pageContext, - Element parent, Attr attr) { - - return ComponentUtil.getBundleValue(pageContext, attr); - } - /* * (non-Javadoc) * Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-07-29 16:49:34 UTC (rev 9403) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-07-29 16:50:37 UTC (rev 9404) @@ -96,8 +96,7 @@ if (outputAttr != null) { // prepare value - String newValue = prepareAttrValue(pageContext, sourceElement, - outputAttr); + String newValue = outputAttr.getValue(); // if escape then contents of value (or other attribute) is only // text 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-07-29 16:49:34 UTC (rev 9403) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2008-07-29 16:50:37 UTC (rev 9404) @@ -96,16 +96,7 @@ return true; } - @Override - protected String prepareAttrValue(VpePageContext pageContext, - Element parent, Attr attr) { - int offset = ((IDOMAttr) attr).getValueRegionStartOffset(); - String newString = prepareAttrValueByParams(attr.getNodeValue(), - getParams(parent)); - return ComponentUtil.getBundleValue(pageContext, newString, offset); - } - /** * find message format elements and update value *