Author: artdaw Date: 2011-02-07 13:05:06 -0500 (Mon, 07 Feb 2011) New Revision: 21522 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java Log: RF-10290: attribute style s fixed for dataTable and collapcibleSubTable Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-02-07 17:22:21 UTC (rev 21521) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-02-07 18:05:06 UTC (rev 21522) @@ -22,19 +22,18 @@ package org.richfaces.renderkit; -import java.io.IOException; -import java.util.Iterator; +import org.richfaces.component.Row; +import org.richfaces.component.UIDataTableBase; +import org.richfaces.component.util.HtmlUtil; 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 * @@ -125,7 +124,7 @@ Object key = dataTable.getRowKey(); dataTable.captureOrigValue(context); dataTable.setRowKey(context, null); - + encodeTableStructure(writer, context, dataTable); encodeHeaderFacet(writer, context, dataTable, false); @@ -236,7 +235,6 @@ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":tb", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, getTableBodySkinClass(), null); - encodeStyle(writer, facesContext, dataTableBase, null); } public void encodeTableBodyEnd(ResponseWriter writer) throws IOException { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-02-07 17:22:21 UTC (rev 21521) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-02-07 18:05:06 UTC (rev 21522) @@ -23,10 +23,14 @@ package org.richfaces.renderkit; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import org.ajax4jsf.javascript.JSFunction; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractCollapsibleSubTable; +import org.richfaces.component.AbstractDataTable; +import org.richfaces.component.Row; +import org.richfaces.component.UIDataTableBase; +import org.richfaces.event.ToggleEvent; +import org.richfaces.renderkit.util.AjaxRendererUtils; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -35,16 +39,11 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.event.AbortProcessingException; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; -import org.ajax4jsf.javascript.JSFunction; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractCollapsibleSubTable; -import org.richfaces.component.AbstractDataTable; -import org.richfaces.component.Row; -import org.richfaces.component.UIDataTableBase; -import org.richfaces.event.ToggleEvent; -import org.richfaces.renderkit.util.AjaxRendererUtils; - /** * @author Anton Belevich * @@ -136,6 +135,8 @@ public void encodeTableFacets(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { AbstractCollapsibleSubTable subTable = (AbstractCollapsibleSubTable)dataTable; + encodeStyle(writer, context, subTable, null); + encodeHeaderFacet(writer, context, subTable, false); String rowClass = getRowSkinClass(); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-02-07 17:22:21 UTC (rev 21521) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-02-07 18:05:06 UTC (rev 21522) @@ -22,18 +22,6 @@ package org.richfaces.renderkit; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.ajax4jsf.javascript.JSFunction; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractCollapsibleSubTable; @@ -43,6 +31,17 @@ import org.richfaces.component.util.HtmlUtil; import org.richfaces.renderkit.util.AjaxRendererUtils; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * @author Anton Belevich */ @@ -97,6 +96,7 @@ public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { if (dataTable instanceof AbstractDataTable) { + encodeStyle(writer, context, dataTable, null); encodeCaption(writer, context, (AbstractDataTable) dataTable); // TODO nick - do we need this element if "columnsWidth" is absent? writer.startElement(HtmlConstants.COLGROUP_ELEMENT, dataTable);