Author: dmaliarevich Date: 2010-11-12 06:07:55 -0500 (Fri, 12 Nov 2010) New Revision: 26498 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/customFaceletComponent.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java Log: https://jira.jboss.org/browse/JBIDE-7535 , VpeAnyCreator was updated: one more DIV was added, JUnits were updated. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml 2010-11-12 11:07:55 UTC (rev 26498) @@ -5,27 +5,35 @@ </SPAN> </test> <test id="id3"> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -ui:composition -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -ui:define -<SPAN CLASS="vpe-text"> -Greeting to User +<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> + <DIV CLASS="__any__tag__caption" STYLE=""> + ui:composition +</DIV> + <DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> + <DIV CLASS="__any__tag__caption" STYLE=""> + ui:define +</DIV> + <SPAN CLASS="vpe-text"> + Greeting to User </SPAN> + </DIV> + <DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> + <DIV CLASS="__any__tag__caption" STYLE=""> + ui:define </DIV> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -ui:define -<SPAN CLASS="vpe-text"> -Greeting Page + <SPAN CLASS="vpe-text"> + Greeting Page </SPAN> + </DIV> + <DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> + <DIV CLASS="__any__tag__caption" STYLE=""> + ui:define </DIV> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -ui:define -<SPAN CLASS="vpe-text"> -Hello #{person.name}! + <SPAN CLASS="vpe-text"> + Hello #{person.name}! </SPAN> + </DIV> </DIV> -</DIV> </test> </tests> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/customFaceletComponent.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/customFaceletComponent.xhtml.xml 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/customFaceletComponent.xhtml.xml 2010-11-12 11:07:55 UTC (rev 26498) @@ -5,9 +5,11 @@ </SPAN> </test> <test id="id2"> - <DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> - component - </DIV> +<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> + <DIV CLASS="__any__tag__caption" STYLE=""> + component +</DIV> +</DIV> </test> <test id="id3"> <SPAN> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml 2010-11-12 11:07:55 UTC (rev 26498) @@ -1,18 +1,22 @@ <tests> <test id="incorrectCustomTags"> -<DIV ID="incorrectCustomTags" > +<DIV ID="incorrectCustomTags"> <!-- Custom template doesn't defined --> <DIV VPE:INCLUDE-ELEMENT="yes" > ma:test<BR VPE:PSEUDO-ELEMENT="yes" /> </DIV> <!-- Custom template defined, but hasn't source node --> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -mo:paginator<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> +<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +<DIV CLASS="__any__tag__caption" STYLE=""> +mo:paginator +</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> </DIV> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -mo:test<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> +<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +<DIV CLASS="__any__tag__caption" STYLE=""> +mo:test +</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> </DIV> <DIV VPE:INCLUDE-ELEMENT="yes"> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml 2010-11-12 11:07:55 UTC (rev 26498) @@ -8,8 +8,10 @@ <SPAN CLASS="vpe-text"> Default namespace detection test page </SPAN> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -h1<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> +<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +<DIV CLASS="__any__tag__caption" STYLE=""> +h1 +</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> </DIV> <INPUT VALUE="Test"/> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2010-11-12 11:07:55 UTC (rev 26498) @@ -146,9 +146,10 @@ nsIDOMNode div = nodeMapping.getVisualNode(); - nsIDOMNode textNode = div.getFirstChild(); + nsIDOMNode textNode = div.getFirstChild().getFirstChild(); - assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE); + assertEquals("Incorrect node types", //$NON-NLS-1$ + textNode.getNodeType(), nsIDOMNode.TEXT_NODE); assertNotNull(textNode.getNodeValue()); assertNotNull(node.getNodeName()); @@ -204,9 +205,10 @@ nsIDOMNode div = nodeMapping.getVisualNode(); - nsIDOMNode textNode = div.getFirstChild(); + nsIDOMNode textNode = div.getFirstChild().getFirstChild(); - assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE); + assertEquals("Incorrect node types", //$NON-NLS-1$ + textNode.getNodeType(), nsIDOMNode.TEXT_NODE); assertNotNull(textNode.getNodeValue()); assertNotNull(node.getNodeName()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2010-11-12 09:55:55 UTC (rev 26497) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2010-11-12 11:07:55 UTC (rev 26498) @@ -166,6 +166,7 @@ } nsIDOMElement anyElement = visualDocument.createElement(tagForDisplay); + nsIDOMElement anyElementName = visualDocument.createElement(tagForDisplay); VpeCreatorInfo creatorInfo = new VpeCreatorInfo(anyElement); @@ -174,10 +175,10 @@ img.setAttribute("src","any.gif"); //$NON-NLS-1$//$NON-NLS-2$ img.setAttribute("width","16"); //$NON-NLS-1$ //$NON-NLS-2$ img.setAttribute("height","16"); //$NON-NLS-1$ //$NON-NLS-2$ - anyElement.appendChild(img); + anyElementName.appendChild(img); } - anyElement.setAttribute(HTML.ATTR_CLASS, CLASS_TAG_CAPTION); + anyElementName.setAttribute(HTML.ATTR_CLASS, CLASS_TAG_CAPTION); String styleString = getExprValue(pageContext, styleExpr, sourceNode); @@ -192,16 +193,16 @@ // styleString = "border: 1px solid green;" +styleString; //$NON-NLS-1$ // } - anyElement.setAttribute(HTML.ATTR_STYLE, styleString); + anyElementName.setAttribute(HTML.ATTR_STYLE, styleString); if (propertyCreators != null) { for (int i = 0; i < propertyCreators.size(); i++) { VpeCreator creator = (VpeCreator)propertyCreators.get(i); if (creator != null) { - VpeCreatorInfo info = creator.create(pageContext, (Element) sourceNode, visualDocument, anyElement, visualNodeMap); + VpeCreatorInfo info = creator.create(pageContext, (Element) sourceNode, visualDocument, anyElementName, visualNodeMap); if (info != null && info.getVisualNode() != null) { nsIDOMAttr attr = (nsIDOMAttr)info.getVisualNode(); - anyElement.setAttributeNode(attr); + anyElementName.setAttributeNode(attr); } } } @@ -209,7 +210,12 @@ String valueStr = getExprValue(pageContext, valueExpr, sourceNode); nsIDOMNode valueNode = visualDocument.createTextNode(valueStr); - anyElement.appendChild(valueNode); + /* + * 'Any tag name' will be placed in the first child of the root visual element. + * If there are other children -- they'll be placed after tag's name + */ + anyElementName.appendChild(valueNode); + anyElement.appendChild(anyElementName); creatorInfo.addDependencySet(dependencySet); return creatorInfo; }