Author: estherbin Date: 2008-09-08 13:07:34 -0400 (Mon, 08 Sep 2008) New Revision: 10148 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java Log: Fixed JBIDE-1606 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-09-08 15:50:35 UTC (rev 10147) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-09-08 17:07:34 UTC (rev 10148) @@ -103,9 +103,17 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { VpeCreationData creationData = null; Element sourceElement = (Element)sourceNode; + + Element srcNode = null; + + if ((sourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) != null) + && (sourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) instanceof Element)) { + srcNode = (Element) sourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE); + } ComponentUtil.setCSSLink(pageContext, STYLE_PATH, COMPONENT_NAME); readDropDownMenuAttributes(sourceElement); + /* * DropDownMenu component structure. * In order of nesting. @@ -172,7 +180,8 @@ /* * Encoding label value */ - Element labelFacet = ComponentUtil.getFacet(sourceElement, LABEL_FACET_NAME); + final Element passedElement = (srcNode != null ? srcNode : sourceElement); + final Element labelFacet = ComponentUtil.getFacet(passedElement, LABEL_FACET_NAME); if (null != labelFacet) { VpeChildrenInfo childrenInfo = new VpeChildrenInfo(ddmTextSpan); childrenInfo.addSourceChild(labelFacet); @@ -189,7 +198,7 @@ /* * Adding child nodes */ - List<Node> children = ComponentUtil.getChildren(sourceElement); + List<Node> children = ComponentUtil.getChildren(passedElement); int groupCount = 1; for (Node child : children) { if (child.getNodeType() == Node.ELEMENT_NODE