[richfaces-svn-commits] JBoss Rich Faces SVN: r2986 - 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-09-18 18:22:02 -0400 (Tue, 18 Sep 2007)
New Revision: 2986

Modified:
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
   trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
fix processing rendered attribute

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2007-09-18 22:21:29 UTC (rev 2985)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2007-09-18 22:22:02 UTC (rev 2986)
@@ -55,14 +55,14 @@
 	 */
 	private static final class ColumnPredicate implements Predicate {
 		public boolean evaluate(Object input) {
-			if (input instanceof UIComponent) {
-				UIComponent component = (UIComponent) input;
-				
-				if (!component.isRendered()) {
-					return false;
-				}
-			}
-			
+//			if (input instanceof UIComponent) {
+//				UIComponent component = (UIComponent) input;
+//				
+//				if (!component.isRendered()) {
+//					return false;
+//				}
+//			}
+//			
 			return (input instanceof UIColumn || input instanceof Column);
 		}
 	}
@@ -93,22 +93,21 @@
 		dataChildren.addIterator(new FilterIterator(getFacets().values()
 				.iterator(), isAjaxSupport));
 
-		dataChildren.addIterator(columns());
 		
 		
 		// Append all columns children.
-		//dataChildren.addIterator(columns());
+		dataChildren.addIterator(columns());
 		
 		
-/*		for (Iterator iter = columns(); iter.hasNext();) {
-			UIComponent column = (UIComponent) iter.next();
-			if (column.isRendered()) {
-				dataChildren.addIterator(column.getChildren()
-						.iterator());
-
-			}
-		}
-*/		
+//		for (Iterator iter = columns(); iter.hasNext();) {
+//			UIComponent column = (UIComponent) iter.next();
+//			if (column.isRendered()) {
+//				dataChildren.addIterator(column.getChildren()
+//						.iterator());
+//
+//			}
+//		}
+		
 		//commons-collections 2.x bug workaround
 		dataChildren.hasNext();
 		

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2007-09-18 22:21:29 UTC (rev 2985)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2007-09-18 22:22:02 UTC (rev 2986)
@@ -63,12 +63,12 @@
 		writer.writeAttribute("span", String.valueOf(columns), null);
 		String columnsWidth = (String) table.getAttributes().get("columnsWidth");
 		
-		// temporary solution RF-957
-		if(columnsWidth.contains("%")){
-			throw new FacesException(PERSENTAGE_SUPPORT_ERROR_MSG); 
-		}
 		
 		if (null != columnsWidth) {
+			// temporary solution RF-957
+			if(columnsWidth.contains("%")){
+				throw new FacesException(PERSENTAGE_SUPPORT_ERROR_MSG); 
+			}
 			String[] widths = columnsWidth.split(",");
 			for (int i = 0; i < widths.length; i++) {
 				writer.startElement("col", table);