Author: Alex.Kolonitsky Date: 2011-03-10 11:01:10 -0500 (Thu, 10 Mar 2011) New Revision: 22141 Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java Log: RF-10727 tables: rowClass works only defined as string - reviewed by Konstantin Mishin Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-03-10 15:56:30 UTC (rev 22140) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-03-10 16:01:10 UTC (rev 22141) @@ -22,18 +22,19 @@ package org.richfaces.renderkit; -import org.richfaces.component.Row; -import org.richfaces.component.UIDataTableBase; -import org.richfaces.component.util.HtmlUtil; +import java.io.IOException; +import java.util.Iterator; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.Iterator; +import org.richfaces.component.Row; +import org.richfaces.component.UIDataTableBase; +import org.richfaces.component.util.HtmlUtil; + /** * @author Anton Belevich * @@ -84,8 +85,7 @@ decodeSortingFiltering(context, component); } - @Override - protected void encodeRows(FacesContext facesContext, RowHolderBase rowHolder) { + protected void putRowStylesIntoContext(FacesContext facesContext, RowHolderBase rowHolder) { UIDataTableBase dataTableBase = (UIDataTableBase)rowHolder.getRow(); String rowClass = getRowSkinClass(); @@ -96,9 +96,7 @@ cellClass = mergeStyleClasses(CELL_CLASS_KEY, cellClass, dataTableBase); firstClass = mergeStyleClasses(FIRST_ROW_CLASS_KEY, firstClass, dataTableBase); - saveRowStyles(facesContext, dataTableBase.getClientId(facesContext), firstClass, rowClass, cellClass); - - super.encodeRows(facesContext, rowHolder); + saveRowStyles(facesContext, dataTableBase.getClientId(facesContext), firstClass, rowClass, cellClass); } protected boolean isEncodeHeaders(UIDataTableBase table) { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-03-10 15:56:30 UTC (rev 22140) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-03-10 16:01:10 UTC (rev 22141) @@ -185,7 +185,7 @@ public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase holder) throws IOException { RowHolder rowHolder = (RowHolder)holder; Row row = rowHolder.getRow(); - + putRowStylesIntoContext(facesContext, rowHolder); rowHolder.setRowStart(true); Iterator<UIComponent> components = row.columns(); if (rowHolder.isUpdatePartial()) { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-10 15:56:30 UTC (rev 22140) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-10 16:01:10 UTC (rev 22141) @@ -147,6 +147,8 @@ AbstractDataTable dataTable = (AbstractDataTable) row; + putRowStylesIntoContext(facesContext, rowHolder); + boolean partialUpdate = rowHolder.isUpdatePartial(); boolean parentTbodyStart = rowHolder.isEncodeParentTBody(); boolean tbodyStart = parentTbodyStart;