Author: yradtsevich Date: 2009-03-02 14:12:55 -0500 (Mon, 02 Mar 2009) New Revision: 13923 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml Log: RESOLVED - issue JBIDE-3668: a4j:status facet processing https://jira.jboss.org/jira/browse/JBIDE-3668 - Facet stop now overrides the value of attribute stopText in a4j:status template Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java 2009-03-02 19:01:43 UTC (rev 13922) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFStatusTemplate.java 2009-03-02 19:12:55 UTC (rev 13923) @@ -26,6 +26,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.jboss.tools.jsf.vpe.jsf.template.util.model.VpeElementProxyData; +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import com.sun.org.apache.regexp.internal.recompile; @@ -84,11 +85,19 @@ public VpeCreationData create() { nsIDOMElement mainElement = createMainElement(); vpeCreationData = new VpeCreationData(mainElement); - nsIDOMElement stopTextElement = createStopTextElement(); - if (stopTextElement != null) { - mainElement.appendChild(createStopTextElement()); + final VpeChildrenInfo childrenInfo = new VpeChildrenInfo(mainElement); + vpeCreationData.addChildrenInfo(childrenInfo); + + Element stopFacet = ComponentUtil.getFacet(sourceElement, STOP_FACET_NAME); + if (stopFacet != null) { + childrenInfo.addSourceChild(stopFacet); + } else { + nsIDOMElement stopTextElement = createStopTextElement(); + if (stopTextElement != null) { + mainElement.appendChild(createStopTextElement()); + } } - addChildrenInfo(mainElement); + return vpeCreationData; } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2009-03-02 19:01:43 UTC (rev 13922) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2009-03-02 19:12:55 UTC (rev 13923) @@ -9,13 +9,8 @@ <test id="status2"> <SPAN CLASS="StyleClass StopStyleClass" STYLE="border: 3px solid red;"> <SPAN> - STOP TEXT + FACET STOP OUTPUT TEXT </SPAN> - <DIV> - <SPAN> - FACET STOP OUTPUT TEXT - </SPAN> - </DIV> </SPAN> </test> </tests> \ No newline at end of file