Author: nbelaevski Date: 2011-02-21 13:30:41 -0500 (Mon, 21 Feb 2011) New Revision: 21846 Modified: branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 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/AbstractDataTable.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java Log: https://issues.jboss.org/browse/RF-10580 https://issues.jboss.org/browse/RF-10584 Modified: branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java =================================================================== --- branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -30,7 +30,8 @@ * @author Nick Belaevski * */ -@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer")) +@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), +attributes = "rowKeyConverter-prop.xml") public class UIRepeat extends UISequence { public static final String COMPONENT_TYPE = "org.richfaces.Repeat"; Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -46,7 +46,8 @@ family = AbstractCollapsibleSubTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UICollapsibleSubTable", renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"), - tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets) + tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets), + attributes = "rowKeyConverter-prop.xml" ) public abstract class AbstractCollapsibleSubTable extends UIDataTableBase implements Column, Expandable { 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-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -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"} + attributes = {"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/component/AbstractDataTable.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -41,7 +41,8 @@ family = AbstractDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIDataTable", renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"), - tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets) + tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets), + attributes = "rowKeyConverter-prop.xml" ) public abstract class AbstractDataTable extends UIDataTableBase { Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -56,7 +56,8 @@ family = AbstractExtendedDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIExtendedDataTable", renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"), - tag = @Tag(name = "extendedDataTable") + tag = @Tag(name = "extendedDataTable"), + attributes = "rowKeyConverter-prop.xml" ) public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder { Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -42,7 +42,9 @@ * */ @JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM),tag=@Tag(name="list"), - renderer = @JsfRenderer(type = "org.richfaces.ListRenderer")) + renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"), + attributes = "rowKeyConverter-prop.xml" +) public abstract class AbstractList extends UISequence { public static final String TERM = "term"; Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -92,7 +92,7 @@ family = AbstractTree.COMPONENT_FAMILY, tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"), renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"), - attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml"} + attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml", "rowKeyConverter-prop.xml"} ) //TODO add rowData caching for wrapper events public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder, TreeSelectionChangeSource, TreeToggleSource { Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -31,6 +31,7 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.convert.ConverterUtil; /** @@ -45,6 +46,7 @@ private Converter rowKeyConverter; + @Attribute public Converter getRowKeyConverter() { if (this.rowKeyConverter != null) { return this.rowKeyConverter; Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -21,6 +21,7 @@ */ package org.richfaces.component; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; @@ -46,6 +47,7 @@ return COMPONENT_FAMILY; } + @Attribute public Object getNodes() { Object nodes = getStateHelper().eval(PropertyKeys.nodes); @@ -58,6 +60,7 @@ getStateHelper().put(PropertyKeys.nodes, nodes); } + @Attribute public boolean isLeaf() { return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false); } Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java =================================================================== --- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845) +++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846) @@ -21,6 +21,7 @@ */ package org.richfaces.component; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; @@ -46,6 +47,7 @@ return COMPONENT_FAMILY; } + @Attribute public Object getRoots() { Object roots = getStateHelper().eval(PropertyKeys.roots); @@ -58,6 +60,7 @@ getStateHelper().put(PropertyKeys.roots, roots); } + @Attribute public Object getNodes() { return getStateHelper().eval(PropertyKeys.nodes); } @@ -70,6 +73,7 @@ return null; } + @Attribute public boolean isLeaf() { return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false); }