Author: dvinnichek Date: 2010-07-06 11:14:39 -0400 (Tue, 06 Jul 2010) New Revision: 23251 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/JsfSelectOneMenuTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java Log: fix templates for jsf components according to JBIDE-6542 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 2010-07-06 13:28:19 UTC (rev 23250) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2010-07-06 15:14:39 UTC (rev 23251) @@ -186,7 +186,7 @@ // decode int num = Integer.decode(paramNumber); - if (num < paramList.size()) { + if (num < paramList.size() && paramList.get(num).hasAttribute(JSF.ATTR_VALUE)) { // get param's value value = paramList.get(num).getAttribute(JSF.ATTR_VALUE); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java 2010-07-06 13:28:19 UTC (rev 23250) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java 2010-07-06 15:14:39 UTC (rev 23251) @@ -88,13 +88,11 @@ // import attributes from source Set<String> jsfAttributes = ATTR_LIST_COPY.keySet(); - for (String attributeName : jsfAttributes) { - - // get attribute - String attr = element.getAttribute(attributeName); - + for (String attributeName : jsfAttributes) { // 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(Constants.TRUE)) { select.setAttribute(ATTR_LIST_COPY.get(attributeName), Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java 2010-07-06 13:28:19 UTC (rev 23250) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java 2010-07-06 15:14:39 UTC (rev 23251) @@ -73,9 +73,11 @@ sourceElement, ATTR_STYLE_CLASS)); visualTable.setAttribute(HTML.ATTR_STYLE, ComponentUtil.getAttribute( sourceElement, HTML.ATTR_STYLE)); - String border = sourceElement.getAttribute(ATTR_BORDER); - if (border != null) + + if (sourceElement.hasAttribute(ATTR_BORDER)) { + String border = sourceElement.getAttribute(ATTR_BORDER); visualTable.setAttribute(ATTR_BORDER, border); + } NodeList children = sourceNode.getChildNodes(); int count = children != null ? children.getLength() : 0;