Author: konstantin.mishin Date: 2010-05-28 12:12:14 -0400 (Fri, 28 May 2010) New Revision: 17373 Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java Log: RF-7887 Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-28 16:10:48 UTC (rev 17372) +++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-28 16:12:14 UTC (rev 17373) @@ -206,7 +206,7 @@ if (column.isRendered()) { writer.startElement(HTML.TD_ELEM, column); writer.startElement(HTML.DIV_ELEM, column); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-empty-footer-cell rich-extable-cell-width-" + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-efc rf-edt-cw-" + column.getId(), null); writer.endElement(HTML.DIV_ELEM); writer.endElement(HTML.TD_ELEM); @@ -221,20 +221,20 @@ writer.startElement(HTML.TD_ELEM, column); if ("header".equals(facetName)) { writer.startElement(HTML.DIV_ELEM, column); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer-holder rich-extable-cell-width-" + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rsh rf-edt-cw-" + column.getId(), null); writer.startElement(HTML.DIV_ELEM, column); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rs", null); writer.endElement(HTML.DIV_ELEM); writer.endElement(HTML.DIV_ELEM); } writer.startElement(HTML.DIV_ELEM, column); writer - .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + facetName + "-cell", - "rich-extable-cell-width-" + column.getId(), (String) column.getAttributes().get(classAttribute)), + .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + "c", + "rf-edt-cw-" + column.getId(), (String) column.getAttributes().get(classAttribute)), null); writer.startElement(HTML.DIV_ELEM, column); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-" + facetName + "-cell-content", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + "cc", null); UIComponent facet = column.getFacet(facetName); if (facet != null && facet.isRendered()) { facet.encodeAll(context); @@ -252,7 +252,7 @@ boolean columnFacetPresent = table.isColumnFacetPresent(name); if (columnFacetPresent || "footer".equals(name)) { writer.startElement(HTML.DIV_ELEM, table); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + name, (String) table + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0), (String) table .getAttributes().get(name + "Class")), null); writer.startElement(HTML.TABLE_ELEMENT, table); writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null); @@ -266,7 +266,7 @@ if (columns.hasNext()) { writer.startElement(HTML.TD_ELEM, table); if (PartName.frozen.equals(partName) && "footer".equals(name)) { - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-footer-align", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-fa", null); } writer.startElement(HTML.DIV_ELEM, table); if (PartName.frozen.equals(partName)) { @@ -276,8 +276,8 @@ } } else { writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable" - + ("footer".equals(name) ? "-footer" : "") + "-part rich-extable-part-width", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-" + + ("footer".equals(name) ? "f" : "") + "p rf-edt-pw", null); } String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0); @@ -327,7 +327,7 @@ writer.startElement(HTML.DIV_ELEM, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-header", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-th", null); header.encodeAll(context); writer.endElement(HTML.DIV_ELEM); @@ -347,7 +347,7 @@ encoderVariance.encodeStartUpdate(context, tableBodyId); writer.startElement(HTML.DIV_ELEM, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, tableBodyId, null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-b", null); if (table.getRowCount() == 0) { UIComponent facet = table.getFacet("noData"); @@ -365,7 +365,7 @@ table.getAttributes().put("clientFirst", 0); writer.startElement(HTML.DIV_ELEM, table); writer.startElement(HTML.DIV_ELEM, table); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-spacer", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-s", null); writer.endElement(HTML.DIV_ELEM); writer.startElement(HTML.TABLE_ELEMENT, table); writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null); @@ -377,7 +377,7 @@ PartName partName = state.nextPart().getName(); if (PartName.normal.equals(partName)) { writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":body", null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-part rich-extable-part-width", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-p rf-edt-pw", null); } String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0); @@ -421,7 +421,7 @@ writer.startElement(HTML.DIV_ELEM, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-footer", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-tf", null); footer.encodeAll(context); writer.endElement(HTML.DIV_ELEM); @@ -560,7 +560,7 @@ Map<String, Object> attributes = component.getAttributes(); writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context), null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable", (String) attributes.get("styleClass")), null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt", (String) attributes.get("styleClass")), null); getUtils().writeAttribute(writer, HTML.STYLE_ATTRIBUTE, attributes.get("style")); } @@ -587,11 +587,11 @@ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-drag", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-d", null); writer.endElement(HTML.DIV_ELEM); writer.startElement(HTML.TABLE_ELEMENT, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-reorder", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-ro", null); writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HTML.TR_ELEMENT, component); @@ -609,7 +609,7 @@ writer.endElement(HTML.TABLE_ELEMENT); writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-reorder-marker", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rom", null); writer.endElement(HTML.DIV_ELEM); writer.startElement(HTML.INPUT_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null); @@ -649,7 +649,7 @@ UIDataTableBase table = state.getRow(); writer.startElement("style", table); writer.writeAttribute(HTML.TYPE_ATTR, "text/css", null); - writer.writeText(".rich-extable-part-width{", null); // TODO getNormalizedId(context, state.getGrid()) + writer.writeText(".rf-edt-pw {", null); // TODO getNormalizedId(context, state.getGrid()) writer.writeText("width: 100%;", "width"); writer.writeText("}", null); Iterator<UIComponent> columns = table.columns(); @@ -661,7 +661,7 @@ id = column.getId(); } String width = getColumnWidth(column); - writer.writeText(".rich-extable-cell-width-" + id + " {", "width"); // TODO getNormalizedId(context, + writer.writeText(".rf-edt-cw-" + id + " {", "width"); // TODO getNormalizedId(context, writer.writeText("width: " + width + ";", "width"); writer.writeText("}", "width"); } @@ -682,10 +682,10 @@ if (column.isRendered()) { writer.startElement(HTML.TD_ELEM, table); writer.startElement(HTML.DIV_ELEM, table); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-cell rich-extable-cell-width-" + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-cw-" + column.getId(), null); writer.startElement(HTML.DIV_ELEM, column); - writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-cell-content", null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-cc", null); renderChildren(facesContext, column); writer.endElement(HTML.DIV_ELEM); writer.endElement(HTML.DIV_ELEM); Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss =================================================================== --- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-28 16:10:48 UTC (rev 17372) +++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-28 16:12:14 UTC (rev 17373) @@ -19,83 +19,83 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.rich-extable{ +.rf-edt { overflow: hidden; background-color: '#{richSkin.tableBackgroundColor}'; border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; /*height: 100%;*/ } -.rich-extable-header, .rich-extable-table-header { - background-color : '#{richSkin.tableHeaderBackgroundColor}'; +.rf-edt-h, .rf-edt-th { + background-color: '#{richSkin.tableHeaderBackgroundColor}'; } -.rich-extable-table-header { +.rf-edt-th { border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rich-extable-body{ +.rf-edt-b { overflow-x: hidden; overflow-y: auto; width: 100%; } -.rich-extable-spacer { +.rf-edt-s { height: 0px; /*font-size: 0px; line-height: 0px;*/ } -.rich-extable-footer, .rich-extable-table-footer { +.rf-edt-f, .rf-edt-tf { border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; background-color: '#{richSkin.tableFooterBackgroundColor}'; } -.rich-extable-footer-align{ +.rf-edt-fa { vertical-align: top; } -.rich-extable-part{ +.rf-edt-p { overflow: hidden; } -.rich-extable-footer-part{ +.rf-edt-fp { overflow-x: auto; overflow-y: visible; } -.rich-extable-resizer-holder { +.rf-edt-rsh { left : 0px; position: relative; height: 0px; } -.rich-extable-resizer { +.rf-edt-rs { background-image: url("#{resource['spacer.gif']}"); - cursor:e-resize; - height:20px; /*TODO*/ - position:absolute; + cursor: e-resize; + height: 20px; /*TODO*/ + position: absolute; left: 100%; margin-left: -3px; - width:6px; + width: 6px; } -.rich-extable-drag{ - cursor:e-resize; - position:absolute; +.rf-edt-d { + cursor: e-resize; + position: absolute; border-left: '1px dotted #{richSkin.generalTextColor}'; /*background-color: #848089;*/ - width:1px; + width: 1px; display: none; } -.rich-extable-reorder{ - position:absolute; +.rf-edt-ro { + position: absolute; border-collapse: collapse; display: none; } -.rich-extable-reorder th{ +.rf-edt-ro th { width: 20px; height: 5px; font-size: 1px; @@ -103,7 +103,7 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rich-extable-reorder td{ +.rf-edt-ro td { width: 20px; height: 5px; font-size: 1px; @@ -111,44 +111,44 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{ +.rf-edt-c, .rf-edt-hc, .rf-edt-fc { height: 20px; overflow: hidden; border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rich-extable-empty-footer-cell{ +.rf-edt-efc { border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; height: 1px; } -.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content, .rich-extable-table-header, .rich-extable-table-footer{ +.rf-edt-cc, .rf-edt-hcc, .rf-edt-fcc, .rf-edt-th, .rf-edt-tf { padding: 3px 7px; white-space: nowrap; font-family: '#{richSkin.generalFamilyFont}'; font-size: '#{richSkin.generalSizeFont}'; } -.rich-extable-header-cell-content, .rich-extable-table-header { - font-weight:bold; - color : '#{richSkin.tableHeaderTextColor}'; +.rf-edt-hcc, .rf-edt-th { + font-weight: bold; + color: '#{richSkin.tableHeaderTextColor}'; } -.rich-extable-footer-cell-content, .rich-extable-table-footer { - font-weight:bold; +.rf-edt-fcc, .rf-edt-tf { + font-weight: bold; color: '#{richSkin.generalTextColor}'; } -.rich-extable-cell-content { +.rf-edt-cc { color: '#{richSkin.generalTextColor}'; } -.rich-extable-reorder-marker { - position:absolute; +.rf-edt-rom { + position: absolute; height: 9px; font-size: 9px; - width:9px; + width: 9px; background-image: url("#{resource['reorderMarker.gif']}"); display: none; } \ No newline at end of file Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js =================================================================== --- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 16:10:48 UTC (rev 17372) +++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 16:12:14 UTC (rev 17373) @@ -35,7 +35,7 @@ }; richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, ajaxParameters) { - var WIDTH_CLASS_NAME_BASE = "rich-extable-cell-width-"; + var WIDTH_CLASS_NAME_BASE = "rf-edt-cw-"; var MIN_WIDTH = 20; var element = document.getElementById(id); @@ -44,9 +44,9 @@ var reorderElement = document.getElementById(id + ":r"); var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); - var normalPartStyle = richfaces.getCSSRule(".rich-extable-part-width").style; - var header = jQuery(element).children(".rich-extable-header"); - var resizerHolders = header.find(".rich-extable-resizer-holder").get(); + var normalPartStyle = richfaces.getCSSRule(".rf-edt-pw").style; + var header = jQuery(element).children(".rf-edt-h"); + var resizerHolders = header.find(".rf-edt-rsh").get(); var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader"); var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant; @@ -157,7 +157,7 @@ spacerElement = null; dataTableElement = null; } - parts = jQuery(element).find(".rich-extable-part"); + parts = jQuery(element).find(".rf-edt-p"); updateLayout(); updateScrollPosition(); //TODO Restore horizontal scroll position }; @@ -211,7 +211,7 @@ var beginReorder = function(event) { idOfReorderingColumn = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; jQuery(document).bind("mousemove", reorder); - header.find(".rich-extable-header-cell").bind("mouseover", overReorder); + header.find(".rf-edt-hc").bind("mouseover", overReorder); jQuery(document).one("mouseup", cancelReorder); return false; }; @@ -235,7 +235,7 @@ jQuery(this).unbind("mouseout", outReorder); var id = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; var colunmsOrder = ""; - header.find(".rich-extable-header-cell").each(function() { + header.find(".rf-edt-hc").each(function() { var i = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == id) { colunmsOrder += idOfReorderingColumn + "," + id + ","; @@ -248,7 +248,7 @@ var cancelReorder = function(event) { jQuery(document).unbind("mousemove", reorder); - header.find(".rich-extable-header-cell").unbind("mouseover", overReorder); + header.find(".rf-edt-hc").unbind("mouseover", overReorder); reorderElement.style.display = "none"; }; @@ -290,8 +290,8 @@ jQuery(window).bind("resize", updateLayout); jQuery(scrollElement).bind("scroll", updateScrollPosition); var bindHeaderHandlers = function () { - header.find(".rich-extable-resizer").bind("mousedown", beginResize); - header.find(".rich-extable-header-cell").bind("mousedown", beginReorder); + header.find(".rf-edt-rs").bind("mousedown", beginResize); + header.find(".rf-edt-hc").bind("mousedown", beginReorder); } bindHeaderHandlers(); jQuery(bodyElement).bind("scroll", bodyScrollListener); @@ -302,7 +302,7 @@ this.getColumnPosition = function(id) { var position; - var headers = header.find(".rich-extable-header-cell"); + var headers = header.find(".rf-edt-hc"); for (var i = 0; i < headers.length; i++) { if (id == headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]) { position = i; @@ -314,7 +314,7 @@ this.setColumnPosition = function(id, position) { var colunmsOrder = ""; var before; - var headers = header.find(".rich-extable-header-cell"); + var headers = header.find(".rf-edt-hc"); for (var i = 0; i < headers.length; i++) { var current = headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == position) { Modified: root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-28 16:10:48 UTC (rev 17372) +++ root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-28 16:12:14 UTC (rev 17373) @@ -87,7 +87,7 @@ public final void testDoEncodeBegin() throws IOException { HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); - assertEquals("rich-extable", table.getAttribute("class")); + assertEquals("rf-edt", table.getAttribute("class")); assertEquals("headerFacet", table.getElementById("table:headerFacet").getTextContent()); } @@ -103,36 +103,36 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); String text = table.getElementsByTagName("style").get(0).getTextContent(); - assertTrue(text.contains("rich-extable-part-width")); - assertTrue(text.contains("rich-extable-cell-width")); - HtmlElement header = table.getFirstByXPath("div[@class='rich-extable-header']"); + assertTrue(text.contains("rf-edt-pw")); + assertTrue(text.contains("rf-edt-cw")); + HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-h']"); HtmlElement frozenHeader = header.getElementById("table:frozenHeader"); HtmlElement normalHeader = header.getElementById("table:header"); - assertTrue(normalHeader.getAttribute("class").contains("rich-extable-part-width")); - assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rich-extable-resizer']")); - assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rich-extable-resizer']")); + assertTrue(normalHeader.getAttribute("class").contains("rf-edt-pw")); + assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); + assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); assertEquals("headerColumnFacet1", ((HtmlElement) frozenHeader - .getFirstByXPath("//*[@class='rich-extable-header-cell-content']//*[@id='table:headerColumnFacet1']")) + .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet1']")) .getTextContent()); assertEquals("headerColumnFacet2", ((HtmlElement) normalHeader - .getFirstByXPath("//*[@class='rich-extable-header-cell-content']//*[@id='table:headerColumnFacet2']")) + .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet2']")) .getTextContent()); HtmlElement body = table.getElementById("table:b"); - assertEquals("rich-extable-body", body.getAttribute("class")); - assertNotNull(body.getFirstByXPath("descendant::*[@class='rich-extable-spacer']")); + assertEquals("rf-edt-b", body.getAttribute("class")); + assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-s']")); assertNotNull(body - .getFirstByXPath("descendant::*[@class='rich-extable-part rich-extable-part-width']//*[@id='table:tbn']")); + .getFirstByXPath("descendant::*[@class='rf-edt-p rf-edt-pw']//*[@id='table:tbn']")); assertEquals("noDataFacet", ((HtmlElement) page .getFirstByXPath("//*[@id='table2']//*[@id='table2:b']//*[@id='table2:noDataFacet']")).getTextContent()); - HtmlElement footer = table.getFirstByXPath("div[@class='rich-extable-footer']"); - HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rich-extable-footer-align']/div"); + HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-f']"); + HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-fa']/div"); HtmlElement normalFooter = footer.getElementById("table:footer"); - assertTrue(normalFooter.getAttribute("class").contains("rich-extable-part-width")); + assertTrue(normalFooter.getAttribute("class").contains("rf-edt-pw")); assertEquals("footerColumnFacet1", ((HtmlElement) frozenFooter - .getFirstByXPath("descendant::*[@class='rich-extable-footer-cell-content']//*[@id='table:footerColumnFacet1']")) + .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet1']")) .getTextContent()); assertEquals("footerColumnFacet2", ((HtmlElement) normalFooter - .getFirstByXPath("descendant::*[@class='rich-extable-footer-cell-content']//*[@id='table:footerColumnFacet2']")) + .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet2']")) .getTextContent()); } @@ -148,9 +148,9 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); assertEquals("footerFacet", table.getElementById("table:footerFacet").getTextContent()); - assertEquals("rich-extable-drag", table.getElementById("table:d").getAttribute("class")); - assertEquals("rich-extable-reorder", table.getElementById("table:r").getAttribute("class")); - assertEquals("rich-extable-reorder-marker", table.getElementById("table:rm").getAttribute("class")); + assertEquals("rf-edt-d", table.getElementById("table:d").getAttribute("class")); + assertEquals("rf-edt-ro", table.getElementById("table:r").getAttribute("class")); + assertEquals("rf-edt-rom", table.getElementById("table:rm").getAttribute("class")); assertEquals("table:wi", table.getElementById("table:wi").getAttribute("name")); assertTrue(table.getElementsByTagName("script").get(0).getTextContent() .contains("RichFaces.ExtendedDataTable")); @@ -167,9 +167,9 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); HtmlElement cell = table.getElementById("table:0:f").getElementsByTagName("div").get(0); - assertTrue(cell.getAttribute("class").contains("rich-extable-cell")); + assertTrue(cell.getAttribute("class").contains("rf-edt-c")); HtmlElement cellContent = cell.getElementsByTagName("div").get(0); - assertEquals("rich-extable-cell-content", cellContent.getAttribute("class")); + assertEquals("rf-edt-cc", cellContent.getAttribute("class")); assertEquals("value", cellContent.getElementById("table:0:outputText").getTextContent()); }