Author: konstantin.mishin Date: 2011-02-25 13:58:19 -0500 (Fri, 25 Feb 2011) New Revision: 21940 Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java Log: RF-10622 Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-25 18:33:36 UTC (rev 21939) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-25 18:58:19 UTC (rev 21940) @@ -58,7 +58,7 @@ generate = "org.richfaces.component.UIDataGrid", renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"), tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets), - attributes = {"dataGrid-rows-props.xml", "rowKeyConverter-prop.xml"} + attributes = {"core-props.xml", "dataGrid-rows-props.xml", "rowKeyConverter-prop.xml"} ) public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder { Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2011-02-25 18:33:36 UTC (rev 21939) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2011-02-25 18:58:19 UTC (rev 21940) @@ -23,6 +23,7 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.Map; import javax.faces.FacesException; import javax.faces.application.ResourceDependencies; @@ -240,8 +241,10 @@ AbstractDataGrid dataGrid = (AbstractDataGrid)component; writer.startElement(HtmlConstants.TABLE_ELEMENT, dataGrid); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, dataGrid.getClientId(facesContext), null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dg", null); - + Map<String, Object> attributes = dataGrid.getAttributes(); + String classes = concatClasses("rf-dg", attributes.get(HtmlConstants.STYLE_CLASS_ATTR)); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, classes, null); + RenderKitUtils.renderAttribute(facesContext, "style", attributes.get(HtmlConstants.STYLE_ATTRIBUTE)); encodeCaption(writer, facesContext, dataGrid); encodeHeader(writer, facesContext, dataGrid, false); encodeFooter(writer, facesContext, dataGrid, false);