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

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

Author: akushunin
Date: 2007-04-24 09:32:54 -0400 (Tue, 24 Apr 2007)
New Revision: 501

Modified:
   trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
   trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
   trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
Log:
updated columnFacets metod;
added encodeStyle metod for ColomnGroup;

Modified: trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
--- trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2007-04-24 13:22:11 UTC (rev 500)
+++ trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2007-04-24 13:32:54 UTC (rev 501)
@@ -203,7 +203,29 @@
 					"styleClass");
 		}
 	}
+	protected void encodeStyle(ResponseWriter writer, Object parentPredefined,
+			Object predefined, Object parent, Object custom) throws IOException {
+		StringBuffer style = new StringBuffer();
+		// Construct predefined styles
+		if (null != parentPredefined) {
+			style.append(parentPredefined).append(" ");			
+		} else if (null != predefined) {
+			style.append(predefined).append(" ");
+		}
+		// Append style from parent component.
+		if (null != parent) {
+			style.append(parent).append(" ");
+		}
+		if (null != custom) {
+			style.append(custom);
+		}
+		if (style.length() > 0) {
+			writer.writeAttribute("style", style,
+					"style");
+		}
+	}
 
+
 	/**
 	 * Render component and all its children with current row/cell style
 	 * classes.

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-24 13:22:11 UTC (rev 500)
+++ trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2007-04-24 13:32:54 UTC (rev 501)
@@ -34,6 +34,7 @@
 import org.apache.commons.collections.iterators.FilterIterator;
 import org.richfaces.component.Column;
 import org.richfaces.component.Row;
+import org.richfaces.component.UIColumnGroup;
 import org.richfaces.component.UIDataTable;
 
 /**
@@ -82,14 +83,14 @@
 			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,
@@ -119,7 +120,7 @@
 			writer.writeAttribute("scope", "col", null);
 			getUtils().encodeAttribute(context, column, "colspan");
 			UIComponent facet = column.getFacet(facetName);
-			if (facet != null&&facet.isRendered()) {
+			if (facet != null && facet.isRendered()) {
 				renderChild(context, facet);
 			}
 			writer.endElement(element);
@@ -135,7 +136,7 @@
 			writer.startElement("tfoot", table);
 			String footerClass = (String) table.getAttributes().get(
 					"footerClass");
-			
+
 			if (footers.hasNext()) {
 				writer.startElement("tr", table);
 				encodeStyleClass(writer, null,
@@ -257,20 +258,25 @@
 		encodeRowEvents(context, table);
 	}
 
-	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() {
+	/*
+	 * protected Iterator columnFacets(UIDataTable table) { return
+	 * table.columns();
+	 * 
+	 * Changed by Alexej Kushunin
+	 */
+	protected Iterator columnFacets(UIDataTable table){	
+			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;
-			}
-})*/
+				// accept only components which work with facets.
+				 if (component instanceof UIColumnGroup) {
+					 return false;			
+				}
+				 else{
+					 return component.isRendered();}
+	//					&& component.getFacet(name) != null;
+			}});
 	}
 
 	/**

Modified: trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
===================================================================
--- trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java	2007-04-24 13:22:11 UTC (rev 500)
+++ trunk/richfaces/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java	2007-04-24 13:32:54 UTC (rev 501)
@@ -137,6 +137,7 @@
 		writer.startElement(HTML.TR_ELEMENT, colspan);
 		String styleClass;
 		String rowClasses = (String) colspan.getAttributes().get("rowClasses");
+		String style = (String) colspan.getAttributes().get("style");
 		if (null != rowClasses) {
 			String[] classes = rowClasses.split(",");
 			styleClass = classes[currentRow % classes.length];
@@ -150,6 +151,7 @@
 		encodeStyleClass(context.getResponseWriter(), skinRowClass,
 				"dr-tablerow rich-tablerow", requestMap
 						.get(AbstractRowsRenderer.ROW_CLASS_KEY), styleClass);
+		encodeStyle(context.getResponseWriter(),null, null, null, style);
 		getUtils().encodePassThru(context, colspan);
 	}