[richfaces-svn-commits] JBoss Rich Faces SVN: r5079 - in branches/3.1.x/ui/scrollableDataTable/src: test/java/org/richfaces/renderkit/html and 1 other directory.

Author: maksimkaszynski Date: 2007-12-28 10:25:00 -0500 (Fri, 28 Dec 2007) New Revision: 5079 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java Log: Added handling for fake columns Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:09:04 UTC (rev 5078) +++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:25:00 UTC (rev 5079) @@ -280,7 +280,7 @@ writer.startElement(HTML.TR_ELEMENT, grid); state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid)); getUtils().writeAttribute(writer, "id",row_id); - getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass(index)); + getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass()); addRowJavascriptEvents(writer, grid); if (log.isDebugEnabled()) { log.debug("rowIndex : " + index); @@ -342,7 +342,7 @@ row_id = baseClientId + ":f:" + state.getRowIndex(); writer.startElement("tr", grid); - getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass(state.getRowIndex())); + getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass()); getUtils().writeAttribute(writer,"id",row_id); addRowJavascriptEvents(writer, grid); collection.add(row_id); @@ -397,7 +397,7 @@ writer.startElement("tr", grid); getUtils().writeAttribute(writer,"id",row_id); - getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass(state.getRowIndex())); + getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass()); addRowJavascriptEvents(writer, grid); collection.add(row_id); } Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-12-28 15:09:04 UTC (rev 5078) +++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-12-28 15:25:00 UTC (rev 5079) @@ -413,7 +413,11 @@ } } - public String getRowClass(int index) { + public String getRowClass() { + return getRowClass(getRowIndex()) + (isFake() ? " dr-sdt-fake-r rich-sdt-fake-r " : ""); + } + + private String getRowClass(int index) { if(rowClasses != null) { return rowClasses[index % rowClassesSize]; } else { Modified: branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java 2007-12-28 15:09:04 UTC (rev 5078) +++ branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java 2007-12-28 15:25:00 UTC (rev 5079) @@ -196,7 +196,8 @@ public void testRowClass() { String rowClasses = "1,2,3"; state.setRowClasses(rowClasses); - assertEquals("2", state.getRowClass(1)); + state.setRowIndex(1); + assertEquals("2", state.getRowClass()); } public void testIds() { Modified: branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2007-12-28 15:09:04 UTC (rev 5078) +++ branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2007-12-28 15:25:00 UTC (rev 5079) @@ -115,7 +115,7 @@ } static final Set tagNames = new HashSet(); - static final String [] names = {"input","div","script"}; + static final String [] names = {"input","div","script", "table", "tbody", "tr", "td", "thead", "tfoot", "th"}; static { Collections.addAll(tagNames, names); } @@ -128,7 +128,7 @@ HtmlElement div = page.getHtmlElementById(grid.getClientId(facesContext)); assertNotNull(div); - assertEquals("div", div.getNodeName()); + assertEquals("table", div.getNodeName()); String classAttr = div.getAttributeValue("class"); assertTrue(classAttr.contains("dr-sdt"));