11:26 a.m.
Author: akushunin
Date: 2007-04-20 12:26:34 -0400 (Fri, 20 Apr 2007)
New Revision: 472
Modified:
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
Log:
FilterIterator changet to Iterator and added facet rendering check
Updated JUnit tests...
Modified:
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-04-20
15:47:34 UTC (rev 471)
+++
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-04-20
16:26:34 UTC (rev 472)
@@ -77,18 +77,19 @@
int columns) throws IOException {
ResponseWriter writer = context.getResponseWriter();
UIComponent header = table.getHeader();
- Iterator headers = columnFacets(table, "header");
+ Iterator headers = columnFacets(table);
if (header != null || headers.hasNext()) {
writer.startElement("thead", table);
String headerClass = (String) table.getAttributes().get(
"headerClass");
- if (header != null) {
+ if (header != null) {
encodeTableHeaderFacet(context, columns, writer, header,
"dr-table-header rich-table-header",
"dr-table-header-continue rich-table-header-continue",
"dr-table-headercell rich-table-headercell",
headerClass, "td");
}
+
if (headers.hasNext()) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
@@ -118,7 +119,7 @@
writer.writeAttribute("scope", "col", null);
getUtils().encodeAttribute(context, column, "colspan");
UIComponent facet = column.getFacet(facetName);
- if (facet != null) {
+ if (facet != null&&facet.isRendered()) {
renderChild(context, facet);
}
writer.endElement(element);
@@ -129,11 +130,12 @@
int columns) throws IOException {
ResponseWriter writer = context.getResponseWriter();
UIComponent footer = table.getFooter();
- Iterator footers = columnFacets(table, "footer");
+ Iterator footers = columnFacets(table);
if (footer != null || footers.hasNext()) {
writer.startElement("tfoot", table);
String footerClass = (String) table.getAttributes().get(
"footerClass");
+
if (footers.hasNext()) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
@@ -166,8 +168,6 @@
UIComponent column = null;
while (iter.hasNext()) {
column = (UIComponent) iter.next();
- // Clear clientId cache, for current row.
- column.setId(column.getId());
// Start new row for first column - expect a case of the detail
// table, wich will be insert own row.
if (first && !(column instanceof Row)) {
@@ -206,7 +206,7 @@
} else if (column.isRendered()) {
// UIColumn don't have own renderer
writer.startElement(HTML.td_ELEM, table);
-// getUtils().encodeId(context, column);
+ getUtils().encodeId(context, column);
String columnClass = holder.getColumnClass(currentColumn);
encodeStyleClass(writer, null, getCellSkinClass(), null,
columnClass);
@@ -257,17 +257,20 @@
encodeRowEvents(context, table);
}
- protected Iterator columnFacets(UIDataTable table, final String name) {
- return new FilterIterator(table.columns(), new Predicate() {
-
+ protected Iterator columnFacets(UIDataTable table) {
+ return table.columns();
+/*
+ * Changed by Alexej Kushunin
+ * protected Iterator columnFacets(UIDataTable table, final String name){
+ * return new FilterIterator(table.columns(), new Predicate() {
+
public boolean evaluate(Object input) {
UIComponent component = (UIComponent) input;
// accept only components with requested facet.
return component.isRendered()
&& component.getFacet(name) != null;
}
-
- });
+})*/
}
/**
Modified:
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
---
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-04-20
15:47:34 UTC (rev 471)
+++
trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2007-04-20
16:26:34 UTC (rev 472)
@@ -59,7 +59,7 @@
*/
private void encodeHeaderRow(ResponseWriter writer, FacesContext context, UIComponent
component,String facetName) throws IOException {
UIDataTable dataTable = (UIDataTable) component;
- Iterator headers = columnFacets(dataTable, facetName);
+ Iterator headers = columnFacets(dataTable);
String headerClass = (String) component.getAttributes().get(
facetName+"Class");
if (headers.hasNext()) {
Modified:
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
---
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-04-20
15:47:34 UTC (rev 471)
+++
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-04-20
16:26:34 UTC (rev 472)
@@ -324,15 +324,16 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footer rich-table-footer"));
-
+// System.out.println(classAttr);
+ assertTrue(classAttr.contains("dr-table-subfooter rich-table-subfooter
"));
+
tds = tr.getHtmlElementsByTagName("td");
assertTrue(tds.size() > 0);
td = (HtmlElement) tds.get(0);
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr
- .contains("dr-table-footercell rich-table-footercell"));
+// System.out.println(classAttr);
+ assertTrue(classAttr.contains("dr-table-subfootercell
rich-table-subfootercell "));
Iterator fixedChildren = dataTable.fixedChildren();
assertNotNull(fixedChildren);