[jbosstools-commits] JBoss Tools SVN: r6638 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf: templates and 1 other directory.

Author: dmaliarevich Date: 2008-02-28 08:40:46 -0500 (Thu, 28 Feb 2008) New Revision: 6638 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml Log: http://jira.jboss.com/jira/browse/JBIDE-1719, Attribute "dir" was added Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java 2008-02-28 12:22:22 UTC (rev 6637) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java 2008-02-28 13:40:46 UTC (rev 6638) @@ -41,6 +41,7 @@ private static final String SPAN_STYLE_VALUE = "-moz-user-modify: read-write;"; //$NON-NLS-1$ /*h:SelectManyCheckbox attributes*/ + private static final String DIR = "dir"; private static final String DISABLED = "disabled"; private static final String ENABLED_CLASS = "enabledClass"; private static final String DISABLED_CLASS = "disabledClass"; @@ -50,6 +51,7 @@ private static final String ESCAPE = "escape"; private String escape; + private String dir; private String disabled; private String enabledClass; private String disabledClass; @@ -85,6 +87,10 @@ input.setAttribute(HTML.ATTR_TYPE, TYPE_CHECKBOX); + if (attrPresents(dir)) { + input.setAttribute(HTML.ATTR_DIR, dir); + } + if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) { label.setAttribute(CLASS, disabledClass); } else if (attrPresents(enabledClass)) { @@ -167,6 +173,7 @@ return; } Element source = (Element) sourceNode; + dir = source.getAttribute(DIR); disabled = source.getAttribute(DISABLED); enabledClass = source.getAttribute(ENABLED_CLASS); disabledClass = source.getAttribute(DISABLED_CLASS); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java 2008-02-28 12:22:22 UTC (rev 6637) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java 2008-02-28 13:40:46 UTC (rev 6638) @@ -40,9 +40,6 @@ // common part of the name of element private static final String ATTR_NAME_VALUE = "radio_name_"; //$NON-NLS-1$ - // name of attribute which need represent - private static final String ITEM_LABEL_ATTR = "itemLabel"; //$NON-NLS-1$ - // style of span private static final String SPAN_STYLE_VALUE = "-moz-user-modify: read-write;"; //$NON-NLS-1$ @@ -52,6 +49,10 @@ /* "escape" attribute of f:selectItem */ private static final String ESCAPE = "escape"; + /* "dir" attribute of f:selectSelectOneRadio */ + private static final String DIR = "dir"; + + private String dir; private String escape; /** @@ -82,6 +83,11 @@ span.appendChild(radio); span.appendChild(labelSpan); + if (null != element) { + escape = element.getAttribute(ESCAPE); + dir = element.getAttribute(DIR); + } + VpeCreationData creationData = new VpeCreationData(span); // set attributes @@ -90,16 +96,16 @@ radio.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode)); radio.setAttribute(HTML.ATTR_NAME, ATTR_NAME_VALUE + getNameSuffix(sourceNode)); + + if (attrPresents(dir)) { + radio.setAttribute(HTML.ATTR_DIR, dir); + } Attr attr = null; if (element.hasAttribute(ITEM_LABEL)) { attr = element.getAttributeNode(ITEM_LABEL); } - if (null != element) { - escape = element.getAttribute(ESCAPE); - } - if (null != attr) { if (null == escape || "true".equalsIgnoreCase(escape)) { // show text as is @@ -146,25 +152,6 @@ } /** - * get Label of element - * - * @param sourceNode - * @return - */ - private String getLabel(Node sourceNode) { - - // get value of "itemLabeL" from jsf tag - Node attrNode = sourceNode.getAttributes() - .getNamedItem(ITEM_LABEL_ATTR); - - // if attribute exist return value - if (attrNode != null) - return attrNode.getNodeValue(); - - return null; - } - - /** * generate unique suffix of name for radio as unique suffix use start * position of parent tag ( "h:selectOneRadio" or "x:selectOneRadio") * Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-02-28 12:22:22 UTC (rev 6637) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-02-28 13:40:46 UTC (rev 6638) @@ -38,6 +38,11 @@ private static final String ATTR_SIZE = "size"; //$NON-NLS-1$ /** + * "dir" attribute + */ + private static final String ATTR_DIR = "dir"; + + /** * "size" attribute */ private static final String ATTR_MULTIPLE_VALUE = "multiple"; //$NON-NLS-1$ @@ -101,6 +106,13 @@ // get "size" attribute String size = element.getAttribute(ATTR_SIZE); + // get "dir" attribute + String dir = element.getAttribute(ATTR_DIR); + + if (null != dir) { + select.setAttribute(HTML.ATTR_DIR, dir); + } + // add "size" attribute to "select" if (size != null) // if source has "size" attribute import it Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-02-28 12:22:22 UTC (rev 6637) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-02-28 13:40:46 UTC (rev 6638) @@ -710,7 +710,7 @@ <vpe:tag name="h:selectManyMenu" case-sensitive="yes"> <vpe:template children="yes" modify="yes"> - <select style="{@style}" multiple="multiple" class="{@styleClass}" title="{tagstring()}" size="1"/> + <select style="{@style}" multiple="multiple" class="{@styleClass}" title="{tagstring()}" size="1" dir="{@dir}"/> <vpe:dnd> <vpe:drag start-enable="yes"/> <vpe:drop container="yes">