Author: konstantin.mishin Date: 2010-09-22 14:22:03 -0400 (Wed, 22 Sep 2010) New Revision: 19319 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java Log: RF-9292 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-22 17:06:22 UTC (rev 19318) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-22 18:22:03 UTC (rev 19319) @@ -221,7 +221,7 @@ if (column.isRendered()) { writer.startElement(HtmlConstants.TD_ELEM, column); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-efc rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ftr-c-emp rf-edt-c-" + column.getId(), null); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.TD_ELEM); @@ -236,20 +236,21 @@ writer.startElement(HtmlConstants.TD_ELEM, column); if ("header".equals(facetName)) { writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsh rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-cntr rf-edt-c-" + column.getId(), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rs", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.DIV_ELEM); } writer.startElement(HtmlConstants.DIV_ELEM, column); - writer - .writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + "c", - "rf-edt-cw-" + column.getId(), (String) column.getAttributes().get(classAttribute)), - null); + writer.writeAttribute( + HtmlConstants.CLASS_ATTRIBUTE, + HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + facetName.charAt(3) + "r-c", "rf-edt-c-" + + column.getId(), (String) column.getAttributes().get(classAttribute)), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + "cc", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + facetName.charAt(3) + + "r-c-cnt", null); UIComponent facet = column.getFacet(facetName); if (facet != null && facet.isRendered()) { facet.encodeAll(context); @@ -267,8 +268,8 @@ boolean columnFacetPresent = table.isColumnFacetPresent(name); if (columnFacetPresent || "footer".equals(name)) { writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0), - (String) table.getAttributes().get(name + "Class")), null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0) + + name.charAt(3) + "r", (String) table.getAttributes().get(name + "Class")), null); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); @@ -281,7 +282,7 @@ if (columns.hasNext()) { writer.startElement(HtmlConstants.TD_ELEM, table); if (PartName.frozen.equals(partName) && "footer".equals(name)) { - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-fa", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ftr-fzn", null); } writer.startElement(HtmlConstants.DIV_ELEM, table); if (PartName.frozen.equals(partName)) { @@ -292,7 +293,7 @@ } else { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" - + ("footer".equals(name) ? "f" : "") + "p rf-edt-pw", null); + + ("footer".equals(name) ? "ftr-" : "") + "cnt", null); } String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0); @@ -343,7 +344,7 @@ writer.startElement(HtmlConstants.DIV_ELEM, table); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-th", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tbl-hdr", null); header.encodeAll(context); writer.endElement(HtmlConstants.DIV_ELEM); @@ -377,7 +378,7 @@ table.getAttributes().put("clientFirst", 0); writer.startElement(HtmlConstants.DIV_ELEM, table); writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-s", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-spcr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); @@ -390,7 +391,7 @@ PartName partName = state.nextPart().getName(); if (PartName.normal.equals(partName)) { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":body", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-p rf-edt-pw", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt", null); } String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); @@ -432,7 +433,7 @@ writer.startElement(HtmlConstants.DIV_ELEM, table); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, elementId, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tf", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-tbl-ftr", null); footer.encodeAll(context); writer.endElement(HtmlConstants.DIV_ELEM); @@ -607,11 +608,11 @@ throws IOException { writer.startElement(HtmlConstants.DIV_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-d", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-ro", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord", null); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HtmlConstants.TR_ELEMENT, component); @@ -629,7 +630,7 @@ writer.endElement(HtmlConstants.TABLE_ELEMENT); writer.startElement(HtmlConstants.DIV_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rom", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.INPUT_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null); @@ -682,7 +683,7 @@ UIDataTableBase table = state.getRow(); writer.startElement("style", table); writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/css", null); - writer.writeText(".rf-edt-pw {", null); // TODO getNormalizedId(context, state.getGrid()) + writer.writeText(".rf-edt-cnt, .rf-edt-ftr-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) writer.writeText("width: 100%;", "width"); writer.writeText("}", null); Iterator<UIComponent> columns = table.columns(); @@ -694,7 +695,7 @@ id = column.getId(); } String width = getColumnWidth(column); - writer.writeText(".rf-edt-cw-" + id + " {", "width"); // TODO getNormalizedId(context, + writer.writeText(".rf-edt-c-" + id + " {", "width"); // TODO getNormalizedId(context, writer.writeText("width: " + width + ";", "width"); writer.writeText("}", "width"); } @@ -709,19 +710,19 @@ StringBuilder builder = new StringBuilder(); Collection<Object> selection = table.getSelection(); if (selection != null && selection.contains(table.getRowKey())) { - builder.append("rf-edt-r-s"); + builder.append("rf-edt-r-sel"); } if (table.getRowKey().equals(table.getAttributes().get("activeRowKey"))) { if (builder.length() > 0) { builder.append(' '); } - builder.append("rf-edt-r-a"); + builder.append("rf-edt-r-act"); } if (table.getRowKey().equals(table.getAttributes().get("shiftRowKey"))) { if (builder.length() > 0) { builder.append(' '); } - builder.append("rf-edt-r-t"); + builder.append("rf-edt-r-sht"); } if (builder.length() > 0) { writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, builder.toString(), null); @@ -736,10 +737,10 @@ if (column.isRendered()) { writer.startElement(HtmlConstants.TD_ELEM, table); writer.startElement(HtmlConstants.DIV_ELEM, table); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-cw-" + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-c-" + column.getId(), null); writer.startElement(HtmlConstants.DIV_ELEM, column); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cc", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-c-cnt", null); renderChildren(facesContext, column); writer.endElement(HtmlConstants.DIV_ELEM); writer.endElement(HtmlConstants.DIV_ELEM); Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-09-22 17:06:22 UTC (rev 19318) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-09-22 18:22:03 UTC (rev 19319) @@ -25,11 +25,11 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-h, .rf-edt-th { +.rf-edt-hdr, .rf-edt-tbl-hdr { background-image : "url(#{resource['org.richfaces.images:colHdrGrad.png']})"; } -.rf-edt-th { +.rf-edt-tbl-hdr { border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } @@ -39,36 +39,36 @@ width: 100%; } -.rf-edt-s { +.rf-edt-spcr { height: 0px; font-size: 0px; /*for IE7 only*/ } -.rf-edt-f, .rf-edt-tf { +.rf-edt-ftr, .rf-edt-tbl-ftr { border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; background-color: '#{richSkin.tableFooterBackgroundColor}'; } -.rf-edt-fa { +.rf-edt-ftr-fzn { vertical-align: top; } -.rf-edt-p { +.rf-edt-cnt { overflow: hidden; } -.rf-edt-fp { +.rf-edt-ftr-cnt { overflow-x: auto; overflow-y: visible; } -.rf-edt-rsh { +.rf-edt-rsz-cntr { left : 0px; position: relative; height: 0px; } -.rf-edt-rs { +.rf-edt-rsz { background-image: url("#{resource['spacer.gif']}"); cursor: e-resize; height: 20px; /*TODO*/ @@ -78,7 +78,7 @@ width: 6px; } -.rf-edt-d { +.rf-edt-rsz-mkr { cursor: e-resize; position: absolute; border-left: '1px dotted #{richSkin.generalTextColor}'; @@ -87,13 +87,13 @@ display: none; } -.rf-edt-ro { +.rf-edt-rord { position: absolute; border-collapse: collapse; display: none; } -.rf-edt-ro th { +.rf-edt-rord th { width: 20px; height: 5px; font-size: 1px; @@ -101,7 +101,7 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-ro td { +.rf-edt-rord td { width: 20px; height: 5px; font-size: 1px; @@ -109,39 +109,39 @@ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-c, .rf-edt-hc, .rf-edt-fc { +.rf-edt-c, .rf-edt-hdr-c, .rf-edt-ftr-c { height: 20px; overflow: hidden; border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; } -.rf-edt-efc { +.rf-edt-ftr-c-emp { border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}'; height: 1px; } -.rf-edt-cc, .rf-edt-hcc, .rf-edt-fcc, .rf-edt-th, .rf-edt-tf { +.rf-edt-c-cnt, .rf-edt-hdr-c-cnt, .rf-edt-ftr-c-cnt, .rf-edt-tbl-hdr, .rf-edt-tbl-ftr { padding: 3px 7px; white-space: nowrap; font-family: '#{richSkin.generalFamilyFont}'; font-size: '#{richSkin.generalSizeFont}'; } -.rf-edt-hcc, .rf-edt-th, .rf-edt-fcc, .rf-edt-tf { +.rf-edt-hdr-c-cnt, .rf-edt-tbl-hdr, .rf-edt-ftr-c-cnt, .rf-edt-tbl-ftr { font-weight: bold; text-align: center; } -.rf-edt-hcc, .rf-edt-th { +.rf-edt-hdr-c-cnt, .rf-edt-tbl-hdr { color: '#{richSkin.tableHeaderTextColor}'; } -.rf-edt-cc, .rf-edt-fcc, .rf-edt-tf { +.rf-edt-c-cnt, .rf-edt-ftr-c-cnt, .rf-edt-tbl-ftr { color: '#{richSkin.generalTextColor}'; } -.rf-edt-rom { +.rf-edt-rord-mkr { position: absolute; height: 9px; font-size: 9px; @@ -150,10 +150,10 @@ display: none; } -.rf-edt-r-s { +.rf-edt-r-sel { background-color: '#{richSkin.additionalBackgroundColor}'; /*TODO Probably use other skin property.*/ } -.rf-edt-r-a { +.rf-edt-r-act { font-weight: bold; /*TODO Probably use other property.*/ } \ No newline at end of file Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-22 17:06:22 UTC (rev 19318) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-22 18:22:03 UTC (rev 19319) @@ -122,7 +122,7 @@ }; richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, options) { - var WIDTH_CLASS_NAME_BASE = "rf-edt-cw-"; + var WIDTH_CLASS_NAME_BASE = "rf-edt-c-"; var MIN_WIDTH = 20; options = options || {}; @@ -135,9 +135,9 @@ var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); var selectionInput = document.getElementById(id + ":si"); - var normalPartStyle = richfaces.utils.getCSSRule(".rf-edt-pw").style; - var header = jQuery(element).children(".rf-edt-h"); - var resizerHolders = header.find(".rf-edt-rsh"); + var normalPartStyle = richfaces.utils.getCSSRule(".rf-edt-cnt, .rf-edt-ftr-cnt").style; + var header = jQuery(element).children(".rf-edt-hdr"); + var resizerHolders = header.find(".rf-edt-rsz-cntr"); var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader"); var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant; @@ -265,7 +265,7 @@ spacerElement = null; dataTableElement = null; } - parts = jQuery(element).find(".rf-edt-p"); + parts = jQuery(element).find(".rf-edt-cnt, .rf-edt-ftr-cnt"); updateLayout(); updateScrollPosition(); //TODO Restore horizontal scroll position }; @@ -319,7 +319,7 @@ var beginReorder = function(event) { idOfReorderingColumn = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; jQuery(document).bind("mousemove", reorder); - header.find(".rf-edt-hc").bind("mouseover", overReorder); + header.find(".rf-edt-hdr-c").bind("mouseover", overReorder); jQuery(document).one("mouseup", cancelReorder); return false; }; @@ -345,7 +345,7 @@ jQuery(this).unbind("mouseout", outReorder); var id = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; var colunmsOrder = ""; - header.find(".rf-edt-hc").each(function() { + header.find(".rf-edt-hdr-c").each(function() { var i = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == id) { colunmsOrder += idOfReorderingColumn + "," + id + ","; @@ -358,7 +358,7 @@ var cancelReorder = function(event) { jQuery(document).unbind("mousemove", reorder); - header.find(".rf-edt-hc").unbind("mouseover", overReorder); + header.find(".rf-edt-hdr-c").unbind("mouseover", overReorder); reorderElement.style.display = "none"; }; @@ -395,34 +395,34 @@ var selectRow = function(index) { ranges.add(index); for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[index]).addClass("rf-edt-r-s"); + jQuery(tbodies[i].rows[index]).addClass("rf-edt-r-sel"); } } var deselectRow = function (index) { ranges.remove(index); for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[index]).removeClass("rf-edt-r-s"); + jQuery(tbodies[i].rows[index]).removeClass("rf-edt-r-sel"); } } var setActiveRow = function (index) { if(typeof activeIndex == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[activeIndex]).removeClass("rf-edt-r-a"); + jQuery(tbodies[i].rows[activeIndex]).removeClass("rf-edt-r-act"); } } activeIndex = index; for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[activeIndex]).addClass("rf-edt-r-a"); + jQuery(tbodies[i].rows[activeIndex]).addClass("rf-edt-r-act"); } } var resetShiftRow = function () { if(typeof shiftIndex == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[shiftIndex]).removeClass("rf-edt-r-t"); + jQuery(tbodies[i].rows[shiftIndex]).removeClass("rf-edt-r-sht"); } } @@ -434,7 +434,7 @@ shiftIndex = index; if(typeof index == "number") { for ( var i = 0; i < tbodies.length; i++) { - jQuery(tbodies[i].rows[shiftIndex]).addClass("rf-edt-r-t"); + jQuery(tbodies[i].rows[shiftIndex]).addClass("rf-edt-r-sht"); } } } @@ -448,13 +448,13 @@ var rows = tbodies[0].rows; for (var i = 0; i < rows.length; i++) { var row = jQuery(rows[i]); - if (row.hasClass("rf-edt-r-s")) { + if (row.hasClass("rf-edt-r-sel")) { ranges.add(row[0].rowIndex) } - if (row.hasClass("rf-edt-r-a")) { + if (row.hasClass("rf-edt-r-act")) { activeIndex = row[0].rowIndex; } - if (row.hasClass("rf-edt-r-t")) { + if (row.hasClass("rf-edt-r-sht")) { shiftIndex = row[0].rowIndex; } } @@ -616,8 +616,8 @@ jQuery(window).bind("resize", updateLayout); jQuery(scrollElement).bind("scroll", updateScrollPosition); var bindHeaderHandlers = function () { - header.find(".rf-edt-rs").bind("mousedown", beginResize); - header.find(".rf-edt-hc").bind("mousedown", beginReorder); + header.find(".rf-edt-rsz").bind("mousedown", beginResize); + header.find(".rf-edt-hdr-c").bind("mousedown", beginReorder); } bindHeaderHandlers(); jQuery(element).bind("rich:onajaxcomplete", ajaxComplete); @@ -628,7 +628,7 @@ this.getColumnPosition = function(id) { var position; - var headers = header.find(".rf-edt-hc"); + var headers = header.find(".rf-edt-hdr-c"); for (var i = 0; i < headers.length; i++) { if (id == headers[i].className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]) { position = i; @@ -640,7 +640,7 @@ this.setColumnPosition = function(id, position) { var colunmsOrder = ""; var before; - var headers = header.find(".rf-edt-hc"); + var headers = header.find(".rf-edt-hdr-c"); for (var i = 0; i < headers.length; i++) { var current = headers[i].className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]; if (i == position) { Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-09-22 17:06:22 UTC (rev 19318) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-09-22 18:22:03 UTC (rev 19319) @@ -121,36 +121,36 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); String text = table.getElementsByTagName("style").get(0).getTextContent(); - assertTrue(text.contains("rf-edt-pw")); - assertTrue(text.contains("rf-edt-cw")); - HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-h']"); + assertTrue(text.contains(".rf-edt-cnt, .rf-edt-ftr-cnt")); + assertTrue(text.contains("rf-edt-c")); + HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-hdr']"); HtmlElement frozenHeader = header.getElementById("table:frozenHeader"); HtmlElement normalHeader = header.getElementById("table:header"); - assertTrue(normalHeader.getAttribute("class").contains("rf-edt-pw")); - assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); - assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']")); + assertTrue(normalHeader.getAttribute("class").contains("rf-edt-cnt")); + assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rsz']")); + assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rsz']")); assertEquals("headerColumnFacet1", ((HtmlElement) frozenHeader - .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet1']")) + .getFirstByXPath("//*[@class='rf-edt-hdr-c-cnt']//*[@id='table:headerColumnFacet1']")) .getTextContent()); assertEquals("headerColumnFacet2", ((HtmlElement) normalHeader - .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet2']")) + .getFirstByXPath("//*[@class='rf-edt-hdr-c-cnt']//*[@id='table:headerColumnFacet2']")) .getTextContent()); HtmlElement body = table.getElementById("table:b"); assertEquals("rf-edt-b", body.getAttribute("class")); - assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-s']")); + assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-spcr']")); assertNotNull(body - .getFirstByXPath("descendant::*[@class='rf-edt-p rf-edt-pw']//*[@id='table:tbn']")); + .getFirstByXPath("descendant::*[@class='rf-edt-cnt']//*[@id='table:tbn']")); assertEquals("noDataFacet", ((HtmlElement) page .getFirstByXPath("//*[@id='table2']//*[@id='table2:b']//*[@id='table2:noDataFacet']")).getTextContent()); - HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-f']"); - HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-fa']/div"); + HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-ftr']"); + HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-ftr-fzn']/div"); HtmlElement normalFooter = footer.getElementById("table:footer"); - assertTrue(normalFooter.getAttribute("class").contains("rf-edt-pw")); + assertTrue(normalFooter.getAttribute("class").contains("rf-edt-ftr-cnt")); assertEquals("footerColumnFacet1", ((HtmlElement) frozenFooter - .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet1']")) + .getFirstByXPath("descendant::*[@class='rf-edt-ftr-c-cnt']//*[@id='table:footerColumnFacet1']")) .getTextContent()); assertEquals("footerColumnFacet2", ((HtmlElement) normalFooter - .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet2']")) + .getFirstByXPath("descendant::*[@class='rf-edt-ftr-c-cnt']//*[@id='table:footerColumnFacet2']")) .getTextContent()); } @@ -166,9 +166,9 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); assertEquals("footerFacet", table.getElementById("table:footerFacet").getTextContent()); - 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("rf-edt-rsz-mkr", table.getElementById("table:d").getAttribute("class")); + assertEquals("rf-edt-rord", table.getElementById("table:r").getAttribute("class")); + assertEquals("rf-edt-rord-mkr", 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")); @@ -187,7 +187,7 @@ HtmlElement cell = table.getElementById("table:0:f").getElementsByTagName("div").get(0); assertTrue(cell.getAttribute("class").contains("rf-edt-c")); HtmlElement cellContent = cell.getElementsByTagName("div").get(0); - assertEquals("rf-edt-cc", cellContent.getAttribute("class")); + assertEquals("rf-edt-c-cnt", cellContent.getAttribute("class")); assertEquals("value", cellContent.getElementById("table:0:outputText").getTextContent()); }