Author: yradtsevich Date: 2008-11-19 08:44:54 -0500 (Wed, 19 Nov 2008) New Revision: 11879 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/util/JSF.java Log: CODING IN PROGRESS - issue JBIDE-3026: Components with unworked <f:selectItem> nested tag. https://jira.jboss.org/jira/browse/JBIDE-3026 Item #1 has been fixed: "<f:select Item> doesn't work inside next components: <h:selectOneMenu>, <h:selectOneListbox>, <h:selectManyListbox>, <h:selectManyMenu>" 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-11-19 12:07:35 UTC (rev 11878) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-11-19 13:44:54 UTC (rev 11879) @@ -66,9 +66,9 @@ .getAttribute(element, JSF.ATTR_ITEM_DISABLED)); nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION); - if (disabledItem) - + if (disabledItem) { option.setAttribute(HTML.ATTR_DISABLED, Constants.TRUE); + } VpeCreationData creationData = new VpeCreationData(option); if (attrPresents(disabled) && Constants.TRUE.equalsIgnoreCase(disabled)) { @@ -198,10 +198,15 @@ @Override public Attr getOutputAttributeNode(Element element) { - - if (element.hasAttribute(JSF.ATTR_ITEM_LABEL)) - return element.getAttributeNode(JSF.ATTR_ITEM_LABEL); - return null; + Attr outputAttributeNode; + + if (element.hasAttribute(JSF.ATTR_ITEM_LABEL)) { + outputAttributeNode = element.getAttributeNode(JSF.ATTR_ITEM_LABEL); + } else if (element.hasAttribute(JSF.ATTR_ITEM_VALUE)) { + outputAttributeNode = element.getAttributeNode(JSF.ATTR_ITEM_VALUE); + } else { + outputAttributeNode = null; + } + return outputAttributeNode; } - } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-11-19 12:07:35 UTC (rev 11878) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-11-19 13:44:54 UTC (rev 11879) @@ -34,6 +34,8 @@ public static final String ATTR_FOR = "for"; //$NON-NLS-1$ public static final String ATTR_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$ + + public static final String ATTR_ITEM_VALUE = "itemValue"; //$NON-NLS-1$ public static final String ATTR_DISABLED = "disabled"; //$NON-NLS-1$