[jbosstools-commits] JBoss Tools SVN: r12977 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144 and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Sat Jan 10 15:58:12 EST 2009
Author: yradtsevich
Date: 2009-01-10 15:58:12 -0500 (Sat, 10 Jan 2009)
New Revision: 12977
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
Log:
CODING IN PROGRESS - issue JBIDE-3511: Text body of h:outputText and h:outputFormat is rendered in incorrect sequence.
https://jira.jboss.org/jira/browse/JBIDE-3511
- The issue has been fixed.
- JUnit tests have been fixed partially.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2009-01-10 20:58:12 UTC (rev 12977)
@@ -21,6 +21,7 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Attr;
@@ -72,16 +73,24 @@
Element element = (Element) sourceNode;
- // create span element
- nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
-
+ // create container
+ nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument);
// creation data
- VpeCreationData creationData = new VpeCreationData(span);
+ VpeCreationData creationData = new VpeCreationData(mainContainer);
+
+ VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument);
+
+ // create container for values of attributes, for tag body
+ // and append them them to main container
+ nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument);
+ mainContainer.appendChild(attributeValueContainer);
+
+
// copy attributes
- copyOutputJsfAttributes(span, element);
+ copyOutputJsfAttributes(attributeValueContainer, element);
- processOutputAttribute(pageContext, visualDocument, element, span,
+ processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer,
creationData);
return creationData;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java 2009-01-10 20:58:12 UTC (rev 12977)
@@ -11,13 +11,16 @@
package org.jboss.tools.jsf.vpe.jsf.template;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author Sergey Dzmitrovich
@@ -38,28 +41,30 @@
Element element = (Element) sourceNode;
- // create span element
- nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+ nsIDOMElement mainContainer = VisualDomUtil.createBorderlessContainer(visualDocument);
+ VpeCreationData creationData = new VpeCreationData(mainContainer);
+ VisualDomUtil.appendChildrenInsertionPoint(element, mainContainer, creationData, visualDocument);
+
+ // create container for values of attributes, for tag body
+ // and append them them to main container
+ nsIDOMElement attributeValueContainer = VisualDomUtil.createBorderlessContainer(visualDocument);
+ mainContainer.appendChild(attributeValueContainer);
+
// creation data
- VpeCreationData creationData = new VpeCreationData(span);
// copy attributes
- copyOutputJsfAttributes(span, element);
-
- processOutputAttribute(pageContext, visualDocument, element, span,
+ copyOutputJsfAttributes(attributeValueContainer, element);
+ processOutputAttribute(pageContext, visualDocument, element, attributeValueContainer,
creationData);
return creationData;
-
}
@Override
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualNode, Object data, String name, String value) {
-
return true;
}
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,53 +1,63 @@
<tests>
<test id="body_test">
-<DIV ID="body_test" STYLE="-moz-user-modify: read-write;">
-<TABLE STYLE="background-color: red;" CLASS="dr-table rich-table">
-<COLGROUP SPAN="1">
-</COLGROUP>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: green;" CLASS="dr-table-cell rich-table-cell">
-<SPAN CLASS="vpe-text">
-#{test.color}
-</SPAN>
-</TD>
-</TR>
-</TABLE>
-<DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;">
-<TABLE CLASS="dr-table rich-sdt">
-<COLGROUP SPAN="1">
-</COLGROUP>
-<TBODY HEIGHT="100" STYLE="background-color: blue;" WIDTH="100px;">
-</TBODY>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-</TD>
-</TR>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
+ <DIV ID="body_test" STYLE="-moz-user-modify: read-write;" >
+ <TABLE STYLE="" CLASS="dr-table rich-table">
+ <COLGROUP SPAN="1">
+ </COLGROUP>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <SPAN CLASS="vpe-text">
+ #{test.color}
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 100px; height: 100px;">
+ <TABLE CLASS="dr-table rich-sdt">
+ <COLGROUP SPAN="1">
+ </COLGROUP>
+ <TBODY HEIGHT="100" STYLE="" WIDTH="100px;">
+ </TBODY>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
-</TD>
-</TR>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
-</TD>
-</TR>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
-</TD>
-</TR>
-<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
-</TD>
-</TR>
-</TABLE>
-</DIV>
-<SPAN STYLE="background-color: pink;">
-ssssssssss
-</SPAN>
-</DIV>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD STYLE="" CLASS="dr-table-cell rich-table-cell">
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
+
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text" STYLE="">
+ ssssssssss
+ </SPAN>
+ </SPAN>
+ </DIV>
</test>
</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,29 +1,34 @@
<tests>
<test id="test_el">
-<FORM
- STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
- <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;">
- Error Messages
-</SPAN>
- <DIV CLASS="dr-pnl rich-panel" STYLE="">
- <DIV CLASS="dr-pnl-b rich-panel-body">
- <SPAN>
- 123456789 Test El expression Test El expression Test El expression
-</SPAN>
- <DIV
- STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;">
- </BR>
+
+ <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"
+ >
+ <SPAN CLASS="message" STYLE="-moz-user-modify: read-only;">
+ Error Messages
+ </SPAN>
+ <DIV CLASS="dr-pnl rich-panel" STYLE="">
+ <DIV CLASS="dr-pnl-b rich-panel-body">
+ <SPAN CLASS="vpe-text">
+ 123456789 #{test.scope} #{test.scope} #{test.scope}
+ </SPAN>
+ <DIV
+ STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;">
+ <BR VPE:PSEUDO-ELEMENT="yes"
+ STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Hello
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Name: #{test.scope}
+ </SPAN>
+ </DIV>
</DIV>
- <SPAN>
- Hello
-</SPAN>
- <SPAN>
- Name: Test El expression
-</SPAN>
- </DIV>
- </DIV>
-</FORM>
-</test>
+ </FORM>
+ </test>
</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,82 +1,107 @@
<tests>
<test id="jbide3376">
- <DIV ID="jbide3376">
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<TABLE STYLE="-moz-user-modify: read-only;">
-<TR>
-<TD>
-<DIV>
-<TABLE>
-<CAPTION>
-</CAPTION>
-<THEAD>
-<TR>
-<TH>
-<DIV>
-<SPAN>
-Header
-</SPAN>
-</DIV>
-</TH>
-</TR>
-</THEAD>
-<TFOOT>
-<TR>
-<TD>
-<DIV>
-<SPAN>
-Header
-</SPAN>
-</DIV>
-</TD>
-</TR>
-</TFOOT>
-<TBODY>
-<TR>
-<TD STYLE="border: 0px hidden ; padding: 0px;">
-<TABLE WIDTH="100%" BORDER="0">
-<TBODY>
-<TR>
-<TD>
-<SPAN>
-#{book.name}
-</SPAN>
-</TD>
-<TD>
-<SPAN>
-#{book.name}
-</SPAN>
-</TD>
-</TR>
-</TBODY>
-<COLGROUP>
-<COL STYLE="-moz-user-modify: read-write;"/>
+ <DIV ID="jbide3376" CLASS="null">
+ <TABLE
+ STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+ <TR>
+ <TD>
+ <DIV>
+ <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+ <TABLE STYLE="-moz-user-modify: read-only;">
+ <TR>
+ <TD>
+ <DIV>
+ <TABLE>
+ <CAPTION>
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
-<COL STYLE="-moz-user-modify: read-write;"/>
+ </CAPTION>
+ <THEAD>
+ <TR>
+ <TH >
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Header
+ </SPAN>
+ </SPAN>
+ </DIV>
+ </TH>
+ </TR>
+ </THEAD>
+ <TFOOT>
+ <TR>
+ <TD >
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Header
+ </SPAN>
+ </SPAN>
+ </DIV>
+ </TD>
+ </TR>
+ </TFOOT>
+ <TBODY>
+ <TR>
+ <TD STYLE="border: 0px hidden ; padding: 0px;">
+ <TABLE WIDTH="100%" BORDER="0">
+ <TBODY>
+ <TR>
+ <TD>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ #{book.name}
+ </SPAN>
+ </SPAN>
+ </TD>
+ <TD>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ #{book.name}
+ </SPAN>
+ </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ <COLGROUP>
+ <COL STYLE="-moz-user-modify: read-write;" />
-</COLGROUP>
-</TABLE>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-</TD>
-</TR>
-</TABLE><A>Go next page:</A><BR STYLE="-moz-user-modify: read-write;"/>
+ <COL STYLE="-moz-user-modify: read-write;" />
-<SPAN>
-Begin
-</SPAN>
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
-</test>
+ </COLGROUP>
+ </TABLE>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ <A>Go next page:</A>
+ <BR STYLE="-moz-user-modify: read-write;" />
+
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Begin
+ </SPAN>
+ </SPAN>
+ </FORM>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,12 +1,14 @@
<tests>
<test id="dataTable">
- <TABLE STYLE="-moz-user-modify: read-only;">
+
+ <TABLE STYLE="-moz-user-modify: read-only;" >
<TR>
<TD>
<DIV>
<TABLE>
<CAPTION>
<BR _MOZ_DIRTY="" TYPE="_moz" />
+
</CAPTION>
<TBODY>
<TR>
@@ -16,12 +18,24 @@
<TR>
<TH>
<DIV>
- <SPAN>Last Name</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Last Name
+ </SPAN>
+ </SPAN>
</DIV>
</TH>
<TH>
<DIV>
- <SPAN>First Name</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ First Name
+ </SPAN>
+ </SPAN>
</DIV>
</TH>
</TR>
@@ -30,12 +44,24 @@
<TR>
<TD>
<DIV>
- <SPAN>footer</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ footer
+ </SPAN>
+ </SPAN>
</DIV>
</TD>
<TD>
<DIV>
- <SPAN>footer</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ footer
+ </SPAN>
+ </SPAN>
</DIV>
</TD>
</TR>
@@ -43,16 +69,30 @@
<TBODY>
<TR>
<TD>
- <SPAN>Dupont</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Dupont
+ </SPAN>
+ </SPAN>
</TD>
<TD>
- <SPAN>William</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ William
+ </SPAN>
+ </SPAN>
</TD>
</TR>
</TBODY>
<COLGROUP>
- <COL STYLE="-moz-user-modify: read-write;"/>
- <COL STYLE="-moz-user-modify: read-write;"/>
+ <COL STYLE="-moz-user-modify: read-write;" />
+
+ <COL STYLE="-moz-user-modify: read-write;" />
+
</COLGROUP>
</TABLE>
</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/facet.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,7 +1,13 @@
<tests>
<test id="facet">
- <DIV>
- <SPAN> Last Name</SPAN>
+ <DIV >
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Last Name
+ </SPAN>
+ </SPAN>
</DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2009-01-10 20:58:12 UTC (rev 12977)
@@ -8,14 +8,15 @@
<f:view>
<h1><h:outputText value="outputFormat" /></h1>
-
+<div>
<h:outputFormat value="outputFormat1" id="outputFormat1" />
<h:outputFormat escape="true" value="outputFormat2" id="outputFormat2" />
<h:outputFormat escape="false" value="outputFormat3" id="outputFormat3" />
<h:outputFormat value="{0}" id="outputFormat4">
<f:param value="outputFormat4" />
</h:outputFormat>
-
+ <h:outputFormat value="5" id="outputFormat5">outputFormat</h:outputFormat>
+</div>
</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,16 +1,52 @@
<tests>
<test id="outputFormat1">
- <SPAN> outputFormat1 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ outputFormat1
+ </SPAN>
+ </SPAN>
</test>
<test id="outputFormat2">
- <SPAN> outputFormat2 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ outputFormat2
+ </SPAN>
+ </SPAN>
</test>
<test id="outputFormat3">
- <SPAN>
- <SPAN> outputFormat3 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ outputFormat3
+ </SPAN>
+ </SPAN>
</SPAN>
</test>
<test id="outputFormat4">
- <SPAN> outputFormat4 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ outputFormat4
+ </SPAN>
+ </SPAN>
</test>
+ <test id="outputFormat5">
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ outputFormat
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 5
+ </SPAN>
+ </SPAN>
+ </test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2009-01-10 20:58:12 UTC (rev 12977)
@@ -12,7 +12,7 @@
<h:outputText value="outputText1" id="outputText1" />
<h:outputText value="outputText2" id="outputText2" escape="true" />
<h:outputText value="outputText3" id="outputText3" escape="false" />
-
+ <h:outputText value="4" id="outputText4">outputText</h:outputText>
</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,13 +1,44 @@
<tests>
<test id="outputText1">
- <SPAN> outputText1</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ outputText1
+ </SPAN>
+ </SPAN>
+ <SPAN>outputText1</SPAN>
</test>
<test id="outputText2">
- <SPAN> outputText2</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ outputText2
+ </SPAN>
+ </SPAN>
</test>
<test id="outputText3">
- <SPAN>
- <SPAN> outputText3</SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ outputText3
+ </SPAN>
+ </SPAN>
</SPAN>
</test>
+ <test id="outputText4">
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ outputText
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 4
+ </SPAN>
+ </SPAN>
+ </test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,6 +1,6 @@
<tests>
<test id="panelGrid">
- <TABLE>
+ <TABLE STYLE="-moz-user-modify: read-write;" >
<TR>
<TD>
<DIV>
@@ -8,26 +8,62 @@
<TBODY>
<TR CLASS="oddRows">
<TD>
- <SPAN> column 1 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ column 1
+ </SPAN>
+ </SPAN>
</TD>
<TD>
- <SPAN> column 2 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ column 2
+ </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="evenRows">
<TD>
- <SPAN> 1 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 1
+ </SPAN>
+ </SPAN>
</TD>
<TD>
- <SPAN> 2 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 2
+ </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="oddRows">
<TD>
- <SPAN> 3 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 3
+ </SPAN>
+ </SPAN>
</TD>
<TD>
- <SPAN> 4 </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 4
+ </SPAN>
+ </SPAN>
</TD>
</TR>
</TBODY>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2009-01-10 20:58:12 UTC (rev 12977)
@@ -1,14 +1,38 @@
<tests>
<test id="panelGroup1">
- <SPAN>
- <SPAN> 1</SPAN>
- <SPAN> 2</SPAN>
+ <SPAN STYLE="-moz-user-modify: read-write;" >
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 1
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 2
+ </SPAN>
+ </SPAN>
</SPAN>
</test>
<test id="panelGroup2">
- <DIV>
- <SPAN> 3</SPAN>
- <SPAN> 4</SPAN>
+ <DIV STYLE="-moz-user-modify: read-write;" >
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 3
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ <SPAN CLASS="vpe-text">
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ 4
+ </SPAN>
+ </SPAN>
</DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-01-10 19:08:23 UTC (rev 12976)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-01-10 20:58:12 UTC (rev 12977)
@@ -16,6 +16,8 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.mozilla.interfaces.nsIAccessibilityService;
import org.mozilla.interfaces.nsIAccessible;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -33,6 +35,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class VisualDomUtil {
@@ -283,4 +286,28 @@
element.setAttribute(HTML.ATTR_CLASS, HTML.CLASS_VPE_TEXT);
return element;
}
+
+ /**
+ * Appends a container for {@code source}'s children
+ * to {@code target} and adds a new object of {@link VpeChildrenInfo}
+ * in a way that all children will be placed in this container.
+ * @param source source element, cannot be {@code null}
+ * @param target target element, cannot be {@code null}
+ * @param creationData the creation data, cannot be {@code null}
+ * @param visualDocument the visual document, cannot be {@code null}
+ */
+ public static void appendChildrenInsertionPoint(Element source,
+ nsIDOMElement target, VpeCreationData creationData, nsIDOMDocument visualDocument) {
+ nsIDOMElement childrenContainer = createBorderlessContainer(visualDocument);
+ target.appendChild(childrenContainer);
+
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(childrenContainer);
+
+ NodeList childNodes = source.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ childrenInfo.addSourceChild(childNodes.item(i));
+ }
+
+ creationData.addChildrenInfo(childrenInfo);
+ }
}
More information about the jbosstools-commits
mailing list