Author: nbelaevski Date: 2011-02-02 08:03:10 -0500 (Wed, 02 Feb 2011) New Revision: 21385 Added: trunk/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/dataGrid-rows-props.xml Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SelectionRenderer.java Log: https://issues.jboss.org/browse/RF-10375 https://issues.jboss.org/browse/RF-10376 https://issues.jboss.org/browse/RF-10377 https://issues.jboss.org/browse/RF-10379 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -56,7 +56,8 @@ family = AbstractDataGrid.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataGrid", renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"), - tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets) + tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets), + attributes = {"dataGrid-rows-props.xml"} ) public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -23,6 +23,7 @@ package org.richfaces.component; import java.io.IOException; +import java.util.Collection; import java.util.Map; import javax.el.ValueExpression; @@ -79,9 +80,6 @@ public abstract int getFrozenColumns(); @Attribute - public abstract String getCaptionClass(); - - @Attribute public abstract String getStyleClass(); @Attribute @@ -208,4 +206,8 @@ updateState(); } } + + @Attribute + public abstract Collection<Object> getSelection(); + } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-02-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -107,9 +107,6 @@ } @Attribute - public abstract int getColumns(); - - @Attribute public abstract String getNoDataLabel(); @Attribute @@ -134,9 +131,6 @@ public abstract String getStyle(); @Attribute - public abstract Collection<Object> getSelection(); - - @Attribute public abstract Collection<Object> getSortPriority(); @Attribute 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-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -108,11 +108,6 @@ || isColumnAttributeSet(table, "filterBy"); } - protected int getColumnsCount(UIDataTableBase table) { - int columns = table.getColumns(); - return (columns > 0) ? columns : getColumnsCount(table.columns()); - } - public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { //DataTableRenderer override this method } @@ -272,7 +267,7 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dt-tft", null); } - int columns = getColumnsCount(dataTable); + int columns = getColumnsCount(dataTable.columns()); boolean encodePartialUpdateForChildren = (encodePartialUpdate && !partialUpdateEncoded); @@ -374,7 +369,7 @@ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-dt-thd", null); } - int columns = getColumnsCount(dataTable); + int columns = getColumnsCount(dataTable.columns()); boolean encodePartialUpdateForChildren = (encodePartialUpdate && !partialUpdateEncoded); 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-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -101,7 +101,7 @@ // TODO nick - do we need this element if "columnsWidth" is absent? writer.startElement(HtmlConstants.COLGROUP_ELEMENT, dataTable); - int columns = getColumnsCount(dataTable); + int columns = getColumnsCount(dataTable.columns()); writer.writeAttribute(HtmlConstants.SPAN_ELEM, String.valueOf(columns), null); String columnsWidth = (String) dataTable.getAttributes().get("columnsWidth"); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-02-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -762,7 +762,7 @@ public void encodeRow(ResponseWriter writer, FacesContext facesContext, RowHolderBase rowHolder) throws IOException { RendererState state = (RendererState) rowHolder; - UIDataTableBase table = state.getRow(); + AbstractExtendedDataTable table = (AbstractExtendedDataTable) state.getRow(); writer.startElement(HtmlConstants.TR_ELEMENT, table); if (rowHolder.getRow() instanceof UIDataTableBase) { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SelectionRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SelectionRenderer.java 2011-02-02 12:49:07 UTC (rev 21384) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SelectionRenderer.java 2011-02-02 13:03:10 UTC (rev 21385) @@ -33,6 +33,7 @@ import org.ajax4jsf.model.DataVisitResult; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.SequenceRange; +import org.richfaces.component.AbstractExtendedDataTable; import org.richfaces.component.UIDataTableBase; /** @@ -170,7 +171,7 @@ if (selectionString != null && selectionString.length() > 0) { final ClientSelection clientSelection = new ClientSelection(selectionString); final Map<String, Object> attributes = component.getAttributes(); - UIDataTableBase table = (UIDataTableBase) component; + AbstractExtendedDataTable table = (AbstractExtendedDataTable) component; Collection<Object> selection = table.getSelection(); if (selection == null) { selection = new HashSet<Object>(); @@ -209,7 +210,7 @@ } - private void encodeSelectionOutsideCurrentRange(FacesContext context, UIDataTableBase table, String selectionFlag) { //TODO Rename method + private void encodeSelectionOutsideCurrentRange(FacesContext context, AbstractExtendedDataTable table, String selectionFlag) { //TODO Rename method Object key = table.getRowKey(); table.captureOrigValue(context); SequenceRange range = (SequenceRange) table.getComponentState().getRange(); Added: trunk/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/dataGrid-rows-props.xml =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/dataGrid-rows-props.xml (rev 0) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/dataGrid-rows-props.xml 2011-02-02 13:03:10 UTC (rev 21385) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat, + Inc. and individual contributors by the @authors tag. See the copyright.txt + in the distribution for a full listing of individual contributors. This is + free software; you can redistribute it and/or modify it under the terms of + the GNU Lesser General Public License as published by the Free Software Foundation; + either version 2.1 of the License, or (at your option) any later version. + This software is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the + FSF site: http://www.fsf.org. --> +<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"> + + <property> + <property-name>rows</property-name> + <property-class>java.lang.Integer</property-class> + <property-extension> + <cdk:hidden>true</cdk:hidden> + </property-extension> + </property> + +</cdk:properties>