Author: yradtsevich Date: 2008-11-11 03:14:35 -0500 (Tue, 11 Nov 2008) New Revision: 11654 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.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/extendedDataTable.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml Log: RESOLVED - issue JBIDE-2984: Wrap <rich:*Table> in <tbody> https://jira.jboss.org/jira/browse/JBIDE-2984 Tests for rich:column, :dataTable, :extendedDataTable, :orderingList and :scrollableDataTable have been rewritten. Some minor bugs have been fixed. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-11 08:14:35 UTC (rev 11654) @@ -18,6 +18,7 @@ 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.template.VpeCreatorUtil; import org.jboss.tools.vpe.editor.template.VpeTemplate; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; @@ -51,6 +52,16 @@ * @author yradtsevich * */ class RichFacesDataTableChildrenEncoder { + private String firstRowClass = "dr-table-firstrow rich-table-firstrow"; + private String nonFirstRowClass = "dr-table-row rich-table-row"; + + /**@param firstRowClass the class of the first row in the table + * @param nonFirstRowClass the class of all rows in the table except the first one*/ + public void setRowClasses(final String firstRowClass, final String nonFirstRowClass) { + this.firstRowClass = firstRowClass; + this.nonFirstRowClass = nonFirstRowClass; + } + /**Non-HTML tag that is used to create temporary containers for {@code rich:subTable} and {@code rich:columnGroup}.*/ private static final String TAG_SUB_TABLE_OR_COLUMN_GROUP_CONTAINER = "subTableOrColumnGroup-container"; //$NON-NLS-1$ private final VpeCreationData creationData; @@ -89,7 +100,7 @@ || nodeName.endsWith(RichFaces.TAG_COLUMN_GROUP)) { addSubTableOrColumnGroupToTable(child); createNewRow = true; - } else { + } else if (!VpeCreatorUtil.isFacet(child)) { addElementToTable(child); createNewRow = true; } @@ -137,9 +148,9 @@ creationData.addChildrenInfo(currentRowChildrenInfo); rowNumber++; if (rowNumber == 1) { - currentRow.setAttribute(HTML.ATTR_CLASS, "dr-table-firstrow rich-table-firstrow"); //$NON-NLS-1$ + currentRow.setAttribute(HTML.ATTR_CLASS, firstRowClass); //$NON-NLS-1$ } else { - currentRow.setAttribute(HTML.ATTR_CLASS, "dr-table-row rich-table-row"); //$NON-NLS-1$ + currentRow.setAttribute(HTML.ATTR_CLASS, nonFirstRowClass); //$NON-NLS-1$ } } @@ -168,7 +179,7 @@ * Replaces all occurencies of {@link #TAG_SUB_TABLE_OR_COLUMN_GROUP_CONTAINER} tag in * the {@code visualNode} by the tag's child. * @see #addSubTableOrColumnGroupToTable(Node) - * */ + */ private static void fixSubTables(final nsIDOMNode visualNode) { final nsIDOMElement element = (nsIDOMElement) visualNode; final nsIDOMNodeList subTableContainers = element.getElementsByTagName(TAG_SUB_TABLE_OR_COLUMN_GROUP_CONTAINER); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-11 08:14:35 UTC (rev 11654) @@ -547,8 +547,10 @@ // ---------- FINALIZING and children encoding ----------- contentTable.appendChild(thead); - new RichFacesDataTableChildrenEncoder(creationData, visualDocument, - sourceElement, contentTable).encodeChildren(); + RichFacesDataTableChildrenEncoder childrenEncoder = new RichFacesDataTableChildrenEncoder(creationData, visualDocument, + sourceElement, contentTable); + childrenEncoder.setRowClasses(CSS_LIST_ROW_CLASS, CSS_LIST_ROW_CLASS); + childrenEncoder.encodeChildren(); //contentTable.appendChild(tfoot); contentDiv.appendChild(contentTable); //outputDiv.appendChild(contentDiv); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column.xhtml.xml 2008-11-11 08:14:35 UTC (rev 11654) @@ -1,23 +1,21 @@ <tests> <test id="column1"> - <TD CLASS="dr-table-headercell rich-table-headercell" COLSPAN="3" - ID="column1"> + <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> <SPAN> FIELDS</SPAN> </TD> </test> <test id="column2"> - <TD CLASS="dr-table-headercell rich-table-headercell" BREAKBEFORE="true" - ID="column2"> - <SPAN > field1</SPAN> + <TD BREAKBEFORE="true" CLASS="dr-table-headercell rich-table-headercell"> + <SPAN> field1</SPAN> </TD> </test> <test id="column3"> - <TD CLASS="dr-table-cell rich-table-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell" ID="column3"> + <TD CLASS="dr-table-cell rich-table-cell"> <SPAN> #{row.field1}</SPAN> </TD> </test> <test id="column4"> - <TD CLASS="dr-table-footercell rich-table-footercell" ID="column4"> + <TD CLASS="dr-table-footercell rich-table-footercell"> <SPAN> footer1</SPAN> </TD> </test> 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-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2008-11-11 08:14:35 UTC (rev 11654) @@ -8,8 +8,8 @@ <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/"/> + <IMG WIDTH="1" HEIGHT="1" SRC="/.*resources/spacer/spacer.gif/" + STYLE="" /> </TD> <TD COLSPAN="3" CLASS="dr-table-headercell rich-table-headercell"> <SPAN> FIELDS</SPAN> @@ -30,7 +30,7 @@ <TFOOT> <TR CLASS="dr-table-footer rich-table-footer"> <TD CLASS="dr-table-footercell rich-table-footercell"> - <BR _MOZ_DIRTY="" TYPE="_moz"/> + <BR _MOZ_DIRTY="" TYPE="_moz" /> </TD> <TD CLASS="dr-table-footercell rich-table-footercell"> <SPAN> footer1</SPAN> @@ -45,20 +45,16 @@ </TFOOT> <TBODY> <TR CLASS="dr-subtable-cell rich-subtable-cell"> - <TD - CLASS="dr-table-cell rich-table-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell"> + <TD CLASS="dr-table-cell rich-table-cell"> <SPAN> #{rowKey}</SPAN> </TD> - <TD - CLASS="dr-table-cell rich-table-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell"> + <TD CLASS="dr-table-cell rich-table-cell"> <SPAN> #{row.field1}</SPAN> </TD> - <TD - CLASS="dr-table-cell rich-table-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell"> + <TD CLASS="dr-table-cell rich-table-cell"> <SPAN> #{row.field2}</SPAN> </TD> - <TD - CLASS="dr-table-cell rich-table-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell dr-subtable-cell rich-subtable-cell"> + <TD CLASS="dr-table-cell rich-table-cell"> <SPAN> #{row.field3}</SPAN> </TD> </TR> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2008-11-11 08:14:35 UTC (rev 11654) @@ -1,205 +1,118 @@ <tests> <test id="extendedDataTable"> - <TABLE> - <TR> - <TD> - <DIV CLASS="dr-table-hidden" STYLE="width: 100%; height: 500px;"> - <TABLE WIDTH="580" ID="table" VALUE="#{capitalsBean.capitals}" - VAR="cap" SORTMODE="#{extendedTableBean.sortMode}" SELECTIONMODE="#{extendedTableBean.selectionMode}" - CLASS="dr-table rich-table"> - <COLGROUP SPAN="4"> - </COLGROUP> - <THEAD> - <TR CLASS="dr-table-subheader rich-table-subheader"> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> - <TR> - <TD> - <SPAN> Flag</SPAN> - </TD> - <TD> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> - <TR> - <TD> - <SPAN> State Name</SPAN> - </TD> - <TD> - <IMG - SRC="/.*resources/extendedDataTable/sortable.gif/"/> - </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> - <TR> - <TD> - <SPAN> State Capital</SPAN> - </TD> - <TD> - <IMG - SRC="/.*resources/extendedDataTable/sortable.gif/"/> - </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> - <TR> - <TD> - <SPAN> Time Zone</SPAN> - </TD> - <TD> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </TABLE> - </TD> - </TR> - <TR CLASS="dr-table-subheader rich-table-subheader"> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <DIV STYLE="padding: 4px;"> - <INPUT TYPE="text" CLASS="extendedTable-input"/> - </DIV> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <DIV STYLE="padding: 4px;"> - <INPUT TYPE="text" CLASS="extendedTable-input"/> - </DIV> - </TD> - <TD CLASS="dr-table-subheadercell rich-table-subheadercell" - SCOP="col"> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </THEAD> - <TBODY> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <IMG - SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" - STYLE="-moz-user-modify: read-write;"/> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.state}</SPAN> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.name}</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <SPAN> #{cap.timeZone}</SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <IMG - SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" - STYLE="-moz-user-modify: read-write;"/> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.state}</SPAN> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.name}</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <SPAN> #{cap.timeZone}</SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <IMG - SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" - STYLE="-moz-user-modify: read-write;"/> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.state}</SPAN> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.name}</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <SPAN> #{cap.timeZone}</SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <IMG - SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" - STYLE="-moz-user-modify: read-write;"/> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.state}</SPAN> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.name}</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <SPAN> #{cap.timeZone}</SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <IMG - SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" - STYLE="-moz-user-modify: read-write;"/> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.state}</SPAN> - </TD> - <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" - SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" - FILTEREVENT="onkeyup"> - <SPAN> #{cap.name}</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> - <SPAN> #{cap.timeZone}</SPAN> - </TD> - </TR> - </TBODY> - </TABLE> - </DIV> - </TD> - <TD STYLE="height: 100%; width: 17px;"> - <DIV STYLE="height: 100%; overflow-y: scroll;"> - </DIV> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - </TR> - </TABLE> + <DIV STYLE="width: 580px; height: 400px;"> + <TABLE WIDTH="100%" HEIGHT="100%" CELLSPACING="0" CELLPADDING="0" + BORDER="0"> + <COLGROUP> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + </COLGROUP> + <THEAD> + <TR CLASS="dr-table-subheader rich-table-subheader"> + <TH CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <SPAN> + <SPAN> Flag</SPAN> + </SPAN> + </TH> + <TH CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <SPAN> + <SPAN> State Name</SPAN> + </SPAN> + <IMG STYLE="vertical-align: middle;" + SRC="/.*resources/extendedDataTable/sortable.gif/"/> + </TH> + <TH CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <SPAN> + <SPAN> State Capital</SPAN> + </SPAN> + <IMG STYLE="vertical-align: middle;" + SRC="/.*resources/extendedDataTable/sortable.gif/"/> + </TH> + <TH CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <SPAN> + <SPAN> Time Zone</SPAN> + </SPAN> + </TH> + <TH CLASS="dr-table-subheadercell rich-table-subheadercell"> + </TH> + </TR> + <TR CLASS="dr-table-subheader rich-table-subheader"> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <DIV STYLE="padding: 4px;"> + <INPUT TYPE="text" CLASS="extendedTable-input" /> + </DIV> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <DIV STYLE="padding: 4px;"> + <INPUT TYPE="text" CLASS="extendedTable-input" /> + </DIV> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell"> + </TD> + </TR> + </THEAD> + <TFOOT> + <TR CLASS="dr-table-subfooter rich-table-subfooter"> + <TD> + </TD> + </TR> + </TFOOT> + <TBODY> + <TR> + <TD VALIGN="top" COLSPAN="4" STYLE="padding: 0px;"> + <TABLE WIDTH="100%" HEIGHT="100%"> + <COLGROUP> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + <COL WIDTH="100" /> + <COL /> + </COLGROUP> + <TBODY> + <TR> + <TD SORTABLE="false" CLASS="dr-table-cell rich-table-cell"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;" /> + </TD> + <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.state}" + FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" + CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{cap.state}</SPAN> + </TD> + <TD WIDTH="170" SORTABLE="true" SORTBY="#{cap.name}" + FILTERBY="#{cap.state}" FILTEREVENT="onkeyup" + CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{cap.name}</SPAN> + </TD> + <TD SORTABLE="false" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{cap.timeZone}</SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + <TD WIDTH="17" ALIGN="right"> + <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> + </DIV> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2008-11-11 08:14:35 UTC (rev 11654) @@ -28,16 +28,14 @@ </TD> </TR> </THEAD> - <TBODY> - <TR CLASS="rich-ordering-list-row"> - <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell"> - <SPAN> You must be evil</SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell"> - <SPAN> Chris Rea</SPAN> - </TD> - </TR> - </TBODY> + <TR CLASS="rich-ordering-list-row"> + <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell"> + <SPAN> You must be evil</SPAN> + </TD> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN> Chris Rea</SPAN> + </TD> + </TR> </TABLE> </DIV> </TD> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-11-11 08:12:16 UTC (rev 11653) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-11-11 08:14:35 UTC (rev 11654) @@ -4,155 +4,157 @@ <TR> <TD> <DIV CLASS="dr-table-hidden" STYLE="width: 700px; height: 400px;"> - <TABLE WIDTH="700" ROWKEYVAR="rkv" FROZENCOLCOUNT="1" ID="carList" - ROWS="40" COLUMNCLASSES="col" VALUE="#{dataTableScrollerBean.allCars}" - VAR="category" SORTMODE="single" BINDING="#{dataTableScrollerBean.table}" - SORTORDER="#{dataTableScrollerBean.order}" SELECTION="#{dataTableScrollerBean.selection}" - CLASS="dr-table rich-table"> + <TABLE WIDTH="700" ID="carList" ROWKEYVAR="rkv" + FROZENCOLCOUNT="1" ROWS="40" COLUMNCLASSES="col" + VALUE="#{dataTableScrollerBean.allCars}" VAR="category" SORTMODE="single" + BINDING="#{dataTableScrollerBean.table}" SORTORDER="#{dataTableScrollerBean.order}" + SELECTION="#{dataTableScrollerBean.selection}" CLASS="dr-table rich-table"> <COLGROUP SPAN="6"> </COLGROUP> <THEAD> <TR CLASS="dr-table-subheader rich-table-subheader"> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> Make </SPAN> + <SPAN CLASS="headerText"> Make</SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> Model </SPAN> + <SPAN CLASS="headerText"> Model</SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> Price </SPAN> + <SPAN CLASS="headerText"> Price</SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> Mileage </SPAN> + <SPAN CLASS="headerText"> Mileage</SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> VIN </SPAN> + <SPAN CLASS="headerText"> VIN</SPAN> </TD> <TD CLASS="dr-table-subheadercell rich-table-subheadercell" SCOP="col"> - <SPAN CLASS="headerText"> Stock </SPAN> + <SPAN CLASS="headerText"> Stock</SPAN> </TD> </TR> </THEAD> <TBODY> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" ID="make"> - <SPAN> #{category.make} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="model"> - <SPAN> #{category.model} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="price"> - <SPAN> #{category.price} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="mileage"> - <SPAN> #{category.mileage} </SPAN> - </TD> - <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin"> - <SPAN> #{category.vin} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="stock"> - <SPAN> #{category.stock} </SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" ID="make"> - <SPAN> #{category.make} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="model"> - <SPAN> #{category.model} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="price"> - <SPAN> #{category.price} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="mileage"> - <SPAN> #{category.mileage} </SPAN> - </TD> - <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin"> - <SPAN> #{category.vin} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="stock"> - <SPAN> #{category.stock} </SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" ID="make"> - <SPAN> #{category.make} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="model"> - <SPAN> #{category.model} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="price"> - <SPAN> #{category.price} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="mileage"> - <SPAN> #{category.mileage} </SPAN> - </TD> - <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin"> - <SPAN> #{category.vin} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="stock"> - <SPAN> #{category.stock} </SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" ID="make"> - <SPAN> #{category.make} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="model"> - <SPAN> #{category.model} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="price"> - <SPAN> #{category.price} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="mileage"> - <SPAN> #{category.mileage} </SPAN> - </TD> - <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin"> - <SPAN> #{category.vin} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="stock"> - <SPAN> #{category.stock} </SPAN> - </TD> - </TR> - <TR CLASS="dr-table-firstrow rich-table-firstrow"> - <TD CLASS="dr-table-cell rich-table-cell" ID="make"> - <SPAN> #{category.make} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="model"> - <SPAN> #{category.model} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="price"> - <SPAN> #{category.price} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="mileage"> - <SPAN> #{category.mileage} </SPAN> - </TD> - <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin"> - <SPAN> #{category.vin} </SPAN> - </TD> - <TD CLASS="dr-table-cell rich-table-cell" ID="stock"> - <SPAN> #{category.stock} </SPAN> - </TD> - </TR> </TBODY> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD ID="make" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.make}</SPAN> + </TD> + <TD ID="model" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.model}</SPAN> + </TD> + <TD ID="price" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.price}</SPAN> + </TD> + <TD ID="mileage" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.mileage}</SPAN> + </TD> + <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.vin}</SPAN> + </TD> + <TD ID="stock" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.stock}</SPAN> + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD ID="make" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.make}</SPAN> + </TD> + <TD ID="model" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.model}</SPAN> + </TD> + <TD ID="price" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.price}</SPAN> + </TD> + <TD ID="mileage" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.mileage}</SPAN> + </TD> + <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.vin}</SPAN> + </TD> + <TD ID="stock" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.stock}</SPAN> + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD ID="make" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.make}</SPAN> + </TD> + <TD ID="model" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.model}</SPAN> + </TD> + <TD ID="price" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.price}</SPAN> + </TD> + <TD ID="mileage" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.mileage}</SPAN> + </TD> + <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.vin}</SPAN> + </TD> + <TD ID="stock" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.stock}</SPAN> + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD ID="make" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.make}</SPAN> + </TD> + <TD ID="model" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.model}</SPAN> + </TD> + <TD ID="price" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.price}</SPAN> + </TD> + <TD ID="mileage" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.mileage}</SPAN> + </TD> + <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.vin}</SPAN> + </TD> + <TD ID="stock" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.stock}</SPAN> + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD ID="make" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.make}</SPAN> + </TD> + <TD ID="model" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.model}</SPAN> + </TD> + <TD ID="price" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.price}</SPAN> + </TD> + <TD ID="mileage" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.mileage}</SPAN> + </TD> + <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.vin}</SPAN> + </TD> + <TD ID="stock" CLASS="dr-table-cell rich-table-cell"> + <SPAN> #{category.stock}</SPAN> + </TD> + </TR> </TABLE> </DIV> </TD> <TD> <DIV STYLE="overflow: scroll; width: 17px; height: 100%;"> </DIV> + <BR _MOZ_DIRTY="" TYPE="_moz" /> </TD> </TR> <TR> <TD> <DIV STYLE="overflow: scroll; width: 100%; height: 17px;"> </DIV> + <BR _MOZ_DIRTY="" TYPE="_moz" /> </TD> </TR> </TABLE>