Author: yradtsevich Date: 2010-06-25 11:00:06 -0400 (Fri, 25 Jun 2010) New Revision: 23042 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/JsfSelectOneListbox.java Log: https://jira.jboss.org/browse/JBIDE-6542 : ElementImpl.getAttribute always returns non-null String now. - template for h:selectOneListbox has been fixed - template for h:selectManyListbox has been fixed 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 2010-06-25 14:28:17 UTC (rev 23041) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2010-06-25 15:00:06 UTC (rev 23042) @@ -88,38 +88,33 @@ Set<String> jsfAttributes = ATTR_LIST_COPY.keySet(); for (String attributeName : jsfAttributes) { - - // get attribute - String attr = element.getAttribute(attributeName); - - // add attribute to "select" - if (attr != null) { + if (element.hasAttribute(attributeName)) { + // get attribute + String attr = element.getAttribute(attributeName); + // add attribute to "select" select.setAttribute(ATTR_LIST_COPY.get(attributeName), attr); } - } // set "multiple" attribute select.setAttribute(HTML.ATTR_MULTIPLE, ATTR_MULTIPLE_VALUE); - // get "size" attribute - String size = element.getAttribute(JSF.ATTR_SIZE); - - // get "dir" attribute - String dir = element.getAttribute(JSF.ATTR_DIR); - - if (null != dir) { + // set "dir" attribute + if (element.hasAttribute(JSF.ATTR_DIR)) { + String dir = element.getAttribute(JSF.ATTR_DIR); select.setAttribute(HTML.ATTR_DIR, dir); } - // add "size" attribute to "select" - if (size != null) + // set "size" attribute + if (element.hasAttribute(JSF.ATTR_SIZE)) { + String size = element.getAttribute(JSF.ATTR_SIZE); // if source has "size" attribute import it select.setAttribute(HTML.ATTR_SIZE, size); - else + } else { // count size select.setAttribute(HTML.ATTR_SIZE, String .valueOf(countSize(element))); + } return new VpeCreationData(select); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java 2010-06-25 14:28:17 UTC (rev 23041) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java 2010-06-25 15:00:06 UTC (rev 23042) @@ -92,12 +92,9 @@ Set<String> jsfAttributes = ATTR_LIST_COPY.keySet(); for (String attributeName : jsfAttributes) { - - // get attribute - String attr = element.getAttribute(attributeName); - - // add attribute to "select" - if (attr != null) { + if (element.hasAttribute(attributeName)) { + // get attribute + String attr = element.getAttribute(attributeName); if (attributeName.equalsIgnoreCase(HTML.ATTR_DISABLED)) { /* * if (attr.equalsIgnoreCase("true")) { @@ -106,22 +103,23 @@ */ continue; } + + // add attribute to "select" select.setAttribute(ATTR_LIST_COPY.get(attributeName), attr); } - } // get "size" attribute - String size = element.getAttribute(JSF.ATTR_SIZE); - // add "size" attribute to "select" - if (size != null) + if (element.hasAttribute(JSF.ATTR_SIZE)) { + String size = element.getAttribute(JSF.ATTR_SIZE); // if source has "size" attribute import it select.setAttribute(HTML.ATTR_SIZE, size); - else + } else { // count size select.setAttribute(HTML.ATTR_SIZE, String .valueOf(countSize(element))); + } return new VpeCreationData(select); }