Author: yzhishko Date: 2009-12-02 13:09:08 -0500 (Wed, 02 Dec 2009) New Revision: 19005 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 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.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/table.xhtml.xml Log: Fixes tests and classes connected to JBIDE-5352 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2009-12-02 17:41:29 UTC (rev 19004) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2009-12-02 18:09:08 UTC (rev 19005) @@ -55,6 +55,9 @@ while (parentNode != null) { String parentSourcePrefix = parentNode.getPrefix(); + if(parentSourcePrefix==null) { + parentSourcePrefix=""; //$NON-NLS-1$ + } List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(parentNode, pageContext); TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix( @@ -107,6 +110,9 @@ for (int i = 0; i < children.getLength(); i++) { Node childNode = children.item(i); String childSourcePrefix = childNode.getPrefix(); + if(childSourcePrefix==null) { + childSourcePrefix=""; //$NON-NLS-1$ + } List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(childNode, pageContext); @@ -142,7 +148,7 @@ public static String getStyleAttr(Node sourceFontNode) { if (sourceFontNode == null - || !sourceFontNode.getNodeName().endsWith(":font")) { //$NON-NLS-1$ + || !sourceFontNode.getNodeName().endsWith("font")) { //$NON-NLS-1$ return null; } String styleAttrValue = getFontFamily(sourceFontNode) 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 2009-12-02 17:41:29 UTC (rev 19004) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml 2009-12-02 18:09:08 UTC (rev 19005) @@ -5,30 +5,52 @@ </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="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +</H1> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<TABLE WIDTH="400" CELLSPACING="0" CELLPADDING="0" BORDER="0" ALIGN="center" STYLE="border: 1px solid rgb(202, 214, 224); -moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD WIDTH="100%" VALIGN="middle" HEIGHT="42" BGCOLOR="#e4ebeb" ALIGN="center" CLASS="header" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text"> +Greeting Page </SPAN> - </DIV> - <DIV CLASS="__any__tag__caption" - STYLE="border: 1px solid green; -moz-user-modify: read-only;"> - ui:define - <SPAN CLASS="vpe-text"> - Greeting Page +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD WIDTH="100%" HEIGHT="1" BGCOLOR="#cad6e0" ALIGN="center" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +#{user} </SPAN> - </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}! +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD WIDTH="100%" COLSPAN="2" STYLE="-moz-user-modify: read-only;"> +<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BORDER="0" ALIGN="left" STYLE="height: 150px; -moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD WIDTH="100%" VALIGN="middle" ALIGN="center" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text"> +Hello #{person.name}! </SPAN> - </DIV> - </DIV> +</TD> +</TR> +</TBODY> +</TABLE> +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD WIDTH="100%" VALIGN="bottom" HEIGHT="1" BGCOLOR="#cad6e0" COLSPAN="2" STYLE="-moz-user-modify: read-only;"> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</DIV> +</DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/table.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/table.xhtml.xml 2009-12-02 17:41:29 UTC (rev 19004) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/table.xhtml.xml 2009-12-02 18:09:08 UTC (rev 19005) @@ -1,7 +1,7 @@ <tests> <test id="jbide5352Test"> <DIV STYLE="margin: 36px;"> -<SPAN STYLE=""> +<SPAN STYLE="font-family: unknown; font-size: 24pt;"> <DIV><BR/> <SPAN CLASS="vpe-text"> @@ -10,10 +10,10 @@ </DIV> </SPAN> <DIV> -<TABLE CELLSPACING="0px" ALIGN="center" WIDTH="100%"> -</TABLE> -<DIV STYLE="display: none;"> -</DIV> +<TABLE WIDTH="100%" CELLSPACING="0px" ALIGN="center"> +<TR> +<TD VALIGN="middle" ALIGN="center" STYLE="border: 2px solid black;"> +</TD> <TD COLSPAN="2" STYLE="border: 2px solid black;"> <DIV><BR/> @@ -30,6 +30,8 @@ </SPAN> </DIV> </TD> +</TR> +<TR> <TD STYLE="border: 2px solid black;"> <DIV><BR/> @@ -54,6 +56,8 @@ </SPAN> </DIV> </TD> +</TR> +<TR> <TD STYLE="border: 2px solid black;"> <DIV><BR/> @@ -86,6 +90,8 @@ </SPAN> </DIV> </TD> +</TR> +</TABLE> </DIV> <DIV><BR/> @@ -94,10 +100,10 @@ </SPAN> </DIV> <DIV> -<TABLE CELLSPACING="0px" ALIGN="center" WIDTH="100%"> -</TABLE> +<TABLE WIDTH="100%" CELLSPACING="0px" ALIGN="center"> +<TR> <TD ALIGN="center" COLSPAN="2" STYLE="border: 2px solid black;"> -<SPAN STYLE=""> +<SPAN STYLE="font-family: unknown; font-size: 20pt;"> <DIV ALIGN="center"><BR/> <SPAN CLASS="vpe-text"> @@ -106,8 +112,10 @@ </DIV> </SPAN> </TD> -<TD ALIGN="center" VALIGN="middle" STYLE="border: 2px solid black;"> -<SPAN STYLE=""> +</TR> +<TR> +<TD VALIGN="middle" ALIGN="center" STYLE="border: 2px solid black;"> +<SPAN STYLE="font-family: unknown; font-size: 30pt;"> <DIV><BR/> <SPAN CLASS="vpe-text"> @@ -118,8 +126,8 @@ </TD> <TD STYLE="border: 2px solid black;"> <DIV> -<TABLE CELLSPACING="0px" ALIGN="center" WIDTH="100%"> -</TABLE> +<TABLE WIDTH="100%" CELLSPACING="0px" ALIGN="center"> +<TR> <TD STYLE="border: 2px solid black;"> <SPAN CLASS="vpe-text"> #{day} @@ -130,8 +138,12 @@ Blah blah blah </SPAN> </TD> +</TR> +</TABLE> </DIV> </TD> +</TR> +</TABLE> </DIV> </DIV> </test>