Author: mareshkau Date: 2009-12-03 12:06:59 -0500 (Thu, 03 Dec 2009) New Revision: 19029 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-5352 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-03 16:58:35 UTC (rev 19028) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithoutTaglibs.xhtml.xml 2009-12-03 17:06:59 UTC (rev 19029) @@ -5,52 +5,27 @@ </SPAN> </test> <test id="id3"> -<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 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 +</SPAN> </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;"> +<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +ui:define <SPAN CLASS="vpe-text"> Greeting Page </SPAN> -</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> -</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;"> +</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> -</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 +</tests> + Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-12-03 16:58:35 UTC (rev 19028) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-12-03 17:06:59 UTC (rev 19029) @@ -386,7 +386,7 @@ TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourcePrefix, taglibs); if(sourceNodeTaglib == null) { - return sourceNode.getNodeName(); + return sourceNode.getLocalName(); } String sourceNodeUri = sourceNodeTaglib.getUri();