Author: dmaliarevich Date: 2008-12-20 08:41:31 -0500 (Sat, 20 Dec 2008) New Revision: 12791 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java Log: https://jira.jboss.org/jira/browse/JBIDE-3226, creating pseudo content for h:dataTable, h:panelGrid and rich:paint2D was removed. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-20 13:29:41 UTC (rev 12790) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-20 13:41:31 UTC (rev 12791) @@ -636,7 +636,6 @@ <vpe:breaker type="ignore" /> <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> - <vpe:pseudoContent defaultText="yes" /> </vpe:template> </vpe:tag> @@ -661,7 +660,6 @@ <vpe:textFormatting use-default-formats="yes"> <vpe:format type="BlockFormat" addChildren="deny" /> </vpe:textFormatting> - <vpe:pseudoContent defaultText="yes" /> </vpe:template> </vpe:tag> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2008-12-20 13:29:41 UTC (rev 12790) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2008-12-20 13:41:31 UTC (rev 12791) @@ -8,8 +8,7 @@ <TR CLASS="dr-table-header rich-table-header" STYLE="/background-image: url\(.*resources/common/background.gif\);/"> <TD ROWSPAN="2" CLASS="dr-table-headercell rich-table-headercell"> - <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/" - STYLE="" /> + <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/"/> </TD> <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> <SPAN> FIELDS</SPAN> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml 2008-12-20 13:29:41 UTC (rev 12790) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml 2008-12-20 13:41:31 UTC (rev 12791) @@ -1,10 +1,10 @@ <tests> <test id="paint2D"> - <IMG WIDTH="10" HEIGHT="10" SRC="/.*resources/paint2D/paint2D.gif/" + <IMG WIDTH="10" HEIGHT="10" CLASS="rich-paint2D" BGCOLOR="transparent"/> </test> <test id="paint2DWithData"> - <IMG WIDTH="300" HEIGHT="120" SRC="/.*resources/paint2D/paint2D.gif/" + <IMG WIDTH="300" HEIGHT="120" STYLE="color: red;" CLASS="rich-paint2D customStyleClass" BGCOLOR="transparent"/> </test> <test id="paint2DWithDataAndChildren"> @@ -13,7 +13,7 @@ <SPAN>Mama mila ramu</SPAN> <INPUT TYPE="button" VALUE="Button"/> </SPAN> - <IMG WIDTH="300" HEIGHT="120" SRC="/.*resources/paint2D/paint2D.gif/" + <IMG WIDTH="300" HEIGHT="120" STYLE="color: red;" CLASS="rich-paint2D customStyleClass" BGCOLOR="transparent"/> </SPAN> </test> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-20 13:29:41 UTC (rev 12790) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-20 13:41:31 UTC (rev 12791) @@ -604,22 +604,6 @@ protected void addChildren(VpeTemplate containerTemplate, Node sourceContainer, nsIDOMNode visualContainer) { - /* - * Fixes http://jira.jboss.com/jira/browse/JBIDE-1944 author: Denis - * Maliarevich This method is called when template has no - * childrenInfoList. In this case h:dataTable and h:panelGrid should - * display pseudo text - */ - if (containerTemplate instanceof VpeHtmlTemplate) { - int type = ((VpeHtmlTemplate) containerTemplate).getType(); - if ((VpeHtmlTemplate.TYPE_DATATABLE == type) - || (VpeHtmlTemplate.TYPE_PANELGRID == type)) { - setPseudoContent(containerTemplate, sourceContainer, - visualContainer); - return; - } - } - NodeList sourceNodes = sourceContainer.getChildNodes(); int len = sourceNodes.getLength(); int childrenCount = 0;