[richfaces-svn-commits] JBoss Rich Faces SVN: r2456 - in trunk/ui/dataTable/src/main/java/org/richfaces: renderkit and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2007-08-23 14:53:34 -0400 (Thu, 23 Aug 2007)
New Revision: 2456

Modified:
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
   trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
Fix wrong method name ( renderedColumns instead of columns() )

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2007-08-23 18:20:46 UTC (rev 2455)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2007-08-23 18:53:34 UTC (rev 2456)
@@ -93,7 +93,7 @@
 		dataChildren.addIterator(new FilterIterator(getFacets().values()
 				.iterator(), isAjaxSupport));
 
-		dataChildren.addIterator(renderedColumns());
+		dataChildren.addIterator(columns());
 		
 		
 		// Append all columns children.
@@ -126,7 +126,7 @@
 		fixedChildren.addIterator(new FilterIterator(getChildren().iterator(),
 				isNotColumn));
 		// Append all columns facets.
-		for (Iterator iter = renderedColumns(); iter.hasNext();) {
+		for (Iterator iter = columns(); iter.hasNext();) {
 			UIComponent column = (UIComponent) iter.next();
 			if (column.isRendered()) {
 				fixedChildren.addIterator(column.getFacets().values()
@@ -141,7 +141,7 @@
 		return fixedChildren;
 	}
 
-	public Iterator renderedColumns() {
+	public Iterator columns() {
 		return new FilterIterator(getChildren().iterator(), isColumn);
 	}
 

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java	2007-08-23 18:20:46 UTC (rev 2455)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java	2007-08-23 18:53:34 UTC (rev 2456)
@@ -50,9 +50,11 @@
 		throw new IllegalStateException("Property 'breakBefore' for subtable is read-only");		
 	}
 
-	public Iterator columns() {
-		return new FilterIterator(getChildren().iterator(),isColumn);
-	}
-
+    /* (non-Javadoc)
+     * @see org.richfaces.component.UIDataTable#columns()
+     */
+    public Iterator columns() {
+    	return super.columns();
+    }
 	
 }

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2007-08-23 18:20:46 UTC (rev 2455)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2007-08-23 18:53:34 UTC (rev 2456)
@@ -185,7 +185,7 @@
 			throws IOException {
 		UIDataTable table = (UIDataTable) holder.getTable();
 		ResponseWriter writer = context.getResponseWriter();
-		Iterator iter = table.renderedColumns();
+		Iterator iter = table.columns();
 		boolean first = true;
 		int currentColumn = 0;
 		UIComponent column = null;
@@ -287,7 +287,7 @@
 	 * Changed by Alexej Kushunin
 	 */
 	protected Iterator columnFacets(UIDataTable table,final String name){	
-			return new FilterIterator(table.renderedColumns(), new Predicate() {
+			return new FilterIterator(table.columns(), new Predicate() {
 	
 			public boolean evaluate(Object input) {
 				UIComponent component = (UIComponent) input;
@@ -316,7 +316,7 @@
 			count = span.intValue();
 		} else {
 			// calculate max html columns count for all columns/rows children.
-			Iterator col = table.renderedColumns();
+			Iterator col = table.columns();
 			count = calculateRowColumns(col);
 		}
 		return count;