Author: abelevich
Date: 2010-07-12 10:49:04 -0400 (Mon, 12 Jul 2010)
New Revision: 17957
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/UIDataGrid.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataGrid.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datagrid.ecss
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.faces-config.xml
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.taglib.xml
Log:
add datagrid impl with css styles, move put/get to the Attributes map methods from
AbstarctTableBaseRenderer to the AbstractRowsRenderer
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/UIDataGrid.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/UIDataGrid.java
(rev 0)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/UIDataGrid.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -0,0 +1,55 @@
+package org.richfaces.component;
+
+import java.util.Iterator;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class UIDataGrid extends UISequence implements Row {
+
+ public static final String HEADER_FACET_NAME = "header";
+
+ public static final String FOOTER_FACET_NAME = "footer";
+
+ public static final String CAPTION_FACET_NAME = "caption";
+
+ public static final String NODATA_FACET_NAME = "nodata";
+
+ enum PropertyKeys {
+ columns
+ }
+
+ public int getColumns() {
+ return (Integer)getStateHelper().eval(PropertyKeys.columns, 1);
+ }
+
+ public void setColumns(int count) {
+ getStateHelper().put(PropertyKeys.columns, count);
+ }
+
+ public Iterator<UIComponent> columns() {
+ //DataGrid doesn't work with column components
+ return null;
+ }
+
+ public UIComponent getHeaderFacet() {
+ return getFacet(HEADER_FACET_NAME);
+ }
+
+ public UIComponent getFooterFacet() {
+ return getFacet(FOOTER_FACET_NAME);
+ }
+
+ public UIComponent getCaptionFacet() {
+ return getFacet(CAPTION_FACET_NAME);
+ }
+
+ public UIComponent getNoDataFacet() {
+ return getFacet(NODATA_FACET_NAME);
+ }
+
+
+}
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataGrid.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataGrid.java
(rev 0)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataGrid.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -0,0 +1,12 @@
+package org.richfaces.component.html;
+
+import org.richfaces.component.UIDataGrid;
+
+public class HtmlDataGrid extends UIDataGrid {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.DataGrid";
+
+ public HtmlDataGrid() {
+ setRendererType("org.richfaces.DataGridRenderer");
+ }
+}
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -77,4 +77,12 @@
public boolean getRendersChildren() {
return true;
}
+
+ protected String get(FacesContext context, String key) {
+ return (String)context.getAttributes().get(key);
+ }
+
+ protected void put(FacesContext context, String key, String value) {
+ context.getAttributes().put(key, value);
+ }
}
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -144,18 +144,10 @@
return get(context, id + CELL_ELEMENT_KEY);
}
- private String get(FacesContext context, String key) {
- return (String)context.getAttributes().get(key);
- }
-
- protected void put(FacesContext context, String id, String key, String value) {
- context.getAttributes().put(id + key, value);
- }
-
protected void saveRowStyles(FacesContext context, String id, String firstRowClass,
String rowClass, String cellClass) {
- put(context, id, FIRST_ROW_CLASS_KEY, firstRowClass);
- put(context, id, ROW_CLASS_KEY, rowClass);
- put(context, id, CELL_CLASS_KEY, cellClass);
+ put(context, id + FIRST_ROW_CLASS_KEY, firstRowClass);
+ put(context, id + ROW_CLASS_KEY, rowClass);
+ put(context, id + CELL_CLASS_KEY, cellClass);
}
public void encodeStyleClass(ResponseWriter writer, FacesContext context, UIComponent
component,
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -147,7 +147,7 @@
int rowCount = dataTableBase.getRowCount();
- put(facesContext, dataTableBase.getClientId(facesContext), CELL_ELEMENT_KEY,
HTML.TD_ELEM);
+ put(facesContext, dataTableBase.getClientId(facesContext) + CELL_ELEMENT_KEY,
HTML.TD_ELEM);
Object key = dataTableBase.getRowKey();
dataTableBase.captureOrigValue(facesContext);
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java
(rev 0)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -0,0 +1,184 @@
+package org.richfaces.renderkit;
+
+import java.io.IOException;
+
+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 org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.component.UIDataGrid;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+
+@ResourceDependencies({@ResourceDependency(library = "javax.faces", name =
"jsf.js"),
+ @ResourceDependency(name = "jquery.js"), @ResourceDependency(name =
"richfaces.js"),
+ @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name
= "richfaces-base-component.js"),
+ @ResourceDependency(name = "datagrid.ecss")})
+public class DataGridRenderer extends AbstractRowsRenderer {
+
+ private static final EncodeStrategy THEAD = new EncodeStrategy () {
+
+ public void begin(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+
+ UIDataGrid dataGrid = (UIDataGrid)component;
+ int columns = dataGrid.getColumns();
+
+ writer.startElement(HTML.THEAD_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-thead", null);
+ writer.startElement(HTML.TR_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-h", null);
+ writer.startElement(HTML.TH_ELEM, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-h-c", null);
+ writer.writeAttribute(HTML.COLSPAN_ATTRIBUTE, columns, null);
+ }
+
+ public void end(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.endElement(HTML.TH_ELEM);
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.endElement(HTML.THEAD_ELEMENT);
+ }
+ };
+
+ private static final EncodeStrategy TFOOT = new EncodeStrategy () {
+
+ public void begin(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+
+ UIDataGrid dataGrid = (UIDataGrid)component;
+ int columns = dataGrid.getColumns();
+
+ writer.startElement(HTML.TFOOT_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-tfoot", null);
+ writer.startElement(HTML.TR_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-f", null);
+ writer.startElement(HTML.TD_ELEM, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-f-c", null);
+ writer.writeAttribute(HTML.COLSPAN_ATTRIBUTE, columns, null);
+ }
+
+ public void end(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.endElement(HTML.TD_ELEM);
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.endElement(HTML.THEAD_ELEMENT);
+ }
+ };
+
+ private static final EncodeStrategy CAPTION = new EncodeStrategy() {
+ public void begin(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.startElement(HTML.CAPTION_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-cap", null);
+ }
+
+ public void end(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.endElement(HTML.CAPTION_ELEMENT);
+ }
+ };
+
+ private static final EncodeStrategy NODATA = new EncodeStrategy() {
+ public void begin(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.startElement(HTML.CAPTION_ELEMENT, component);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-nd-c", null);
+ }
+
+ public void end(ResponseWriter writer, FacesContext context, UIComponent
component, Object[] params)
+ throws IOException {
+ writer.endElement(HTML.CAPTION_ELEMENT);
+ }
+ };
+
+
+ @Override
+ public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase
rowHolder) throws IOException {
+ UIDataGrid dataGrid = (UIDataGrid) rowHolder.getRow();
+
+ int columns = dataGrid.getColumns();
+ int processRow = rowHolder.getCurrentRow();
+
+ if (columns > 0 && (processRow % columns == 0)) {
+ if (processRow != 0) {
+ writer.endElement(HTML.TR_ELEMENT);
+ }
+ writer.startElement(HTML.TR_ELEMENT, dataGrid);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-r", null);
+ }
+
+ writer.startElement(HTML.TD_ELEM, dataGrid);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg-c", null);
+ getUtils().encodeId(facesContext, dataGrid);
+ renderChildren(facesContext, dataGrid);
+ writer.endElement(HTML.TD_ELEM);
+ }
+
+ public void encodeHeader(ResponseWriter writer, FacesContext facesContext,
UIDataGrid dataGrid) throws IOException {
+ UIComponent footerFacet = dataGrid.getHeaderFacet();
+ encodeFacet(writer, facesContext, footerFacet, THEAD, dataGrid);
+ }
+
+ public void encodeFooter(ResponseWriter writer, FacesContext facesContext, UIDataGrid
dataGrid) throws IOException {
+ UIComponent footerFacet = dataGrid.getFooterFacet();
+ encodeFacet(writer, facesContext, footerFacet, TFOOT, dataGrid);
+ }
+
+ public void encodeCaption(ResponseWriter writer, FacesContext facesContext,
UIDataGrid dataGrid) throws IOException {
+ UIComponent captionFacet = dataGrid.getCaptionFacet();
+ encodeFacet(writer, facesContext, captionFacet, CAPTION, dataGrid);
+ }
+
+ private void encodeNoData(ResponseWriter writer, FacesContext facesContext,
UIDataGrid dataGrid) throws IOException {
+ UIComponent noDataFacet = dataGrid.getNoDataFacet();
+ encodeFacet(writer, facesContext, noDataFacet, NODATA, dataGrid);
+ }
+
+ private void encodeFacet(ResponseWriter writer, FacesContext facesContext,
UIComponent facet, EncodeStrategy strategy, UIDataGrid dataGrid) throws IOException{
+ if(facet != null && facet.isRendered()) {
+ strategy.begin(writer, facesContext, dataGrid, null);
+ facet.encodeAll(facesContext);
+ strategy.end(writer, facesContext, dataGrid, null);
+ }
+ }
+
+ @Override
+ protected void doEncodeChildren(ResponseWriter writer, FacesContext facesContext,
UIComponent component)
+ throws IOException {
+ UIDataGrid dataGrid = (UIDataGrid)component;
+ writer.startElement(HTML.TABLE_ELEMENT, dataGrid);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, dataGrid.getClientId(facesContext),
null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg", null);
+
+ encodeCaption(writer, facesContext, dataGrid);
+ encodeHeader(writer, facesContext, dataGrid);
+ encodeFooter(writer, facesContext, dataGrid);
+
+ writer.startElement(HTML.TBODY_ELEMENT, dataGrid);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-dg", null);
+ if(dataGrid.getRowCount() > 0) {
+ processRows(writer, facesContext, dataGrid, null);
+ } else {
+ encodeNoData(writer, facesContext, dataGrid);
+ }
+ writer.endElement(HTML.TBODY_ELEMENT);
+ writer.endElement(HTML.TABLE_ELEMENT);
+ }
+
+ @Override
+ public RowHolderBase createRowHolder(FacesContext context, UIComponent component,
Object[] options) {
+ return new RowHolder(context, (UIDataGrid)component);
+ }
+
+ @Override
+ protected Class<? extends UIComponent> getComponentClass() {
+ return UIDataGrid.class;
+ }
+}
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -379,7 +379,7 @@
}
protected void setupTableStartElement(FacesContext context, UIComponent component) {
- put(context, component.getClientId(context), CELL_ELEMENT_KEY, HTML.TH_ELEM);
+ put(context, component.getClientId(context) + CELL_ELEMENT_KEY, HTML.TH_ELEM);
}
public EncodeStrategy getHiddenContainerStrategy(UIDataTableBase dataTableBase) {
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -383,7 +383,7 @@
}
protected void setupTableStartElement(FacesContext context, UIComponent component) {
- put(context, component.getClientId(context), CELL_ELEMENT_KEY, HTML.TD_ELEM);
+ put(context, component.getClientId(context) + CELL_ELEMENT_KEY, HTML.TD_ELEM);
}
protected UIDataTableBase findParent(UISubTable subTable) {
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java
(rev 0)
+++
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java 2010-07-12
14:49:04 UTC (rev 17957)
@@ -0,0 +1,28 @@
+package org.richfaces.taglib;
+
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.MetaRuleset;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class DataGridHandler extends ComponentHandler {
+
+ private static final String ELEMENTS = "elements";
+
+ private static final String ROWS = "rows";
+
+ public DataGridHandler(ComponentConfig config) {
+ super(config);
+ }
+
+ @Override
+ protected MetaRuleset createMetaRuleset(Class type) {
+ MetaRuleset metaRuleset = super.createMetaRuleset(type);
+ metaRuleset.alias(ELEMENTS, ROWS);
+ return metaRuleset;
+ }
+
+}
Added:
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datagrid.ecss
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datagrid.ecss
(rev 0)
+++
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datagrid.ecss 2010-07-12
14:49:04 UTC (rev 17957)
@@ -0,0 +1,100 @@
+.rf-dg{
+ background-color:'#{richSkin.tableBackgroundColor}';
+ border-collapse:collapse;
+ border-left-width:'#{richSkin.tableBorderWidth}';
+ border-left-style:solid;
+ border-left-color:'#{richSkin.tableBorderColor}';
+ border-top-width:'#{richSkin.tableBorderWidth}';
+ border-top-style:solid;
+ border-top-color:'#{richSkin.tableBorderColor}';
+ empty-cells:show;
+}
+
+.rf-dg-nd-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
+}
+
+
+.rf-dg-cap{
+}
+
+.rf-dg-r{
+}
+
+.rf-dg-f-r{
+}
+
+.rf-dg-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
+}
+
+.rf-dg-h{
+}
+
+.rf-dg-h-f{
+}
+
+.rf-dg-h-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ background-color : '#{richSkin.tableHeaderBackgroundColor}';
+ background-image :
"url(#{resource['org.richfaces.renderkit.html.images.ColumnHeaderGradientImage']})";
+ background-position: top left;
+ color:'#{richSkin.tableHeaderTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ font-weight:bold;
+ padding:4px;
+ text-align:center;
+}
+
+.rf-dg-th{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+}
+
+.rf-dg-f {
+
+}
+
+.rf-dg-f-f{
+}
+
+.rf-dg-f-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ color:'#{richSkin.generalTextColor}';
+ background-color:'#{richSkin.tableFooterBackgroundColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ font-weight:bold;
+ padding:4px;
+ text-align:center;
+}
\ No newline at end of file
Modified:
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.faces-config.xml
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.faces-config.xml 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.faces-config.xml 2010-07-12
14:49:04 UTC (rev 17957)
@@ -69,7 +69,15 @@
<cdk:generate
xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd...
</component-extension>
</component>
+ <component>
+ <component-type>org.richfaces.DataGrid</component-type>
+ <component-class>org.richfaces.component.html.HtmlDataGrid</component-class>
+ <component-extension>
+ <cdk:generate
xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd...
+ </component-extension>
+ </component>
+
<render-kit>
<render-kit-id>HTML_BASIC</render-kit-id>
<renderer>
@@ -97,6 +105,10 @@
<renderer-type>org.richfaces.SubTableToggleControl</renderer-type>
<renderer-class>org.richfaces.renderkit.html.SubTableToggleControlRenderer</renderer-class>
</renderer>
-
+ <renderer>
+ <component-family>org.richfaces.Data</component-family>
+ <renderer-type>org.richfaces.DataGridRenderer</renderer-type>
+ <renderer-class>org.richfaces.renderkit.DataGridRenderer</renderer-class>
+ </renderer>
</render-kit>
</faces-config>
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.taglib.xml
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.taglib.xml 2010-07-12
14:37:10 UTC (rev 17956)
+++
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/tables.taglib.xml 2010-07-12
14:49:04 UTC (rev 17957)
@@ -46,5 +46,12 @@
<renderer-type>org.richfaces.SubTableToggleControlRenderer</renderer-type>
</component>
</tag>
+ <tag>
+ <tag-name>dataGrid</tag-name>
+ <component>
+ <component-type>org.richfaces.DataGrid</component-type>
+ <renderer-type>org.richfaces.DataGridRenderer</renderer-type>
+ </component>
+ </tag>
</facelet-taglib>