Author: artdaw Date: 2011-03-11 14:31:01 -0500 (Fri, 11 Mar 2011) New Revision: 22176 Added: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java Modified: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java Log: RF-10737: rowKeyConverter is fixed for iteration components, a4j:repeat. CollapsibleSubTable cannot be fixed right now, so new issue is created. Verified by Nick Belaevski?\209?\142 Modified: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java =================================================================== --- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -30,8 +30,11 @@ * @author Nick Belaevski * */ -@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"), -attributes = "rowKeyConverter-prop.xml") +@JsfComponent( + tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler",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"; Added: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java =================================================================== --- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java (rev 0) +++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -0,0 +1,24 @@ +package org.richfaces.view.facelets.html; + +import org.richfaces.view.facelets.RowKeyConverterRule; + +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.MetaRuleset; + +/** + * User: Gleb Galkin + * Date: 11.03.11 + */ +public class RepeatHandler extends ComponentHandler { + + public RepeatHandler(ComponentConfig config) { + super(config); + } + + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset metaRuleset = super.createMetaRuleset(type); + metaRuleset.addRule(RowKeyConverterRule.INSTANCE); + return metaRuleset; + } +} \ No newline at end of file Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -22,9 +22,12 @@ package org.richfaces.component; -import java.io.IOException; -import java.util.Collection; -import java.util.Map; +import org.richfaces.cdk.annotations.*; +import org.richfaces.context.ExtendedVisitContext; +import org.richfaces.context.ExtendedVisitContextMode; +import org.richfaces.log.Logger; +import org.richfaces.log.RichfacesLogger; +import org.richfaces.model.SelectionMode; import javax.el.ValueExpression; import javax.faces.component.UIComponent; @@ -32,19 +35,11 @@ import javax.faces.component.visit.VisitContext; import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; +import java.io.IOException; +import java.util.Collection; +import java.util.Map; -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.EventName; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.cdk.annotations.Tag; -import org.richfaces.context.ExtendedVisitContext; -import org.richfaces.context.ExtendedVisitContextMode; -import org.richfaces.log.Logger; -import org.richfaces.log.RichfacesLogger; -import org.richfaces.model.SelectionMode; - /** * @author Konstantin Mishin * @@ -56,7 +51,7 @@ family = AbstractExtendedDataTable.COMPONENT_FAMILY, generate = "org.richfaces.component.UIExtendedDataTable", renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"), - tag = @Tag(name = "extendedDataTable"), + tag = @Tag(name = "extendedDataTable", handler = "org.richfaces.taglib.ExtendedDataTableHandler", type = TagType.Facelets), attributes = "rowKeyConverter-prop.xml" ) public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -21,29 +21,26 @@ package org.richfaces.component; -import java.util.Iterator; - -import javax.faces.component.UIComponent; - -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.EventName; -import org.richfaces.cdk.annotations.Facet; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.cdk.annotations.Tag; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; +import org.richfaces.cdk.annotations.*; +import javax.faces.component.UIComponent; +import java.util.Iterator; + /** * JSF component class * */ -@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM),tag=@Tag(name="list"), - renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"), - attributes = "rowKeyConverter-prop.xml" +@JsfComponent( + type = "org.richfaces.List", + family = "org.richfaces.List", + facets = @Facet(name = AbstractList.TERM), + tag = @Tag(name = "list", handler = "org.richfaces.taglib.ListHandler", type = TagType.Facelets), + renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"), + attributes = "rowKeyConverter-prop.xml" ) public abstract class AbstractList extends UISequence { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -23,38 +23,32 @@ package org.richfaces.taglib; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.MetaRule; -import javax.faces.view.facelets.MetaRuleset; -import javax.faces.view.facelets.Metadata; -import javax.faces.view.facelets.MetadataTarget; -import javax.faces.view.facelets.TagAttribute; - import org.richfaces.component.AbstractCollapsibleSubTable; +import org.richfaces.view.facelets.RowKeyConverterRule; +import javax.faces.view.facelets.*; + /** * @author Anton Belevich * */ public class CollapsibleSubTableHandler extends ComponentHandler { - private static final CollapsibleSubTableHandlerMetaRule METARULE = new CollapsibleSubTableHandlerMetaRule(); - - public CollapsibleSubTableHandler(ComponentConfig config) { super(config); } protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset m = super.createMetaRuleset(type); - m.addRule(METARULE); + m.addRule(CollapsibleSubTableHandlerMetaRule.INSTANCE); + m.addRule(RowKeyConverterRule.INSTANCE); return m; } static class CollapsibleSubTableHandlerMetaRule extends MetaRule { + public static final CollapsibleSubTableHandlerMetaRule INSTANCE = new CollapsibleSubTableHandlerMetaRule(); + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { if (meta.isTargetInstanceOf(AbstractCollapsibleSubTable.class) && "toggleListener".equals(name)) { return new CollapsibleSubTableMapper(attribute); Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -22,6 +22,8 @@ package org.richfaces.taglib; +import org.richfaces.view.facelets.RowKeyConverterRule; + import javax.faces.view.facelets.ComponentConfig; import javax.faces.view.facelets.ComponentHandler; import javax.faces.view.facelets.MetaRuleset; @@ -44,6 +46,7 @@ protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset metaRuleset = super.createMetaRuleset(type); metaRuleset.alias(ELEMENTS, ROWS); + metaRuleset.addRule(RowKeyConverterRule.INSTANCE); return metaRuleset; } Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -23,36 +23,30 @@ package org.richfaces.taglib; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.MetaRule; -import javax.faces.view.facelets.MetaRuleset; -import javax.faces.view.facelets.Metadata; -import javax.faces.view.facelets.MetadataTarget; -import javax.faces.view.facelets.TagAttribute; - import org.richfaces.component.AbstractDataTable; +import org.richfaces.view.facelets.RowKeyConverterRule; +import javax.faces.view.facelets.*; + /** * @author Anton Belevich * */ public class DataTableHandler extends ComponentHandler { - private static final SortingFilteringRule METARULE = new SortingFilteringRule(); - public DataTableHandler(ComponentConfig config) { super(config); } protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset m = super.createMetaRuleset(type); - m.addRule(METARULE); + m.addRule(SortingFilteringRule.INSTANCE); + m.addRule(RowKeyConverterRule.INSTANCE); return m; } static class SortingFilteringRule extends MetaRule { + private static final SortingFilteringRule INSTANCE = new SortingFilteringRule(); public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { if(meta.isTargetInstanceOf(AbstractDataTable.class)) { Added: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java (rev 0) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -0,0 +1,24 @@ +package org.richfaces.taglib; + +import org.richfaces.view.facelets.RowKeyConverterRule; + +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.MetaRuleset; + +/** + * User: Gleb Galkin + * Date: 11.03.11 + */ +public class ExtendedDataTableHandler extends ComponentHandler { + + public ExtendedDataTableHandler(ComponentConfig config) { + super(config); + } + + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset metaRuleset = super.createMetaRuleset(type); + metaRuleset.addRule(RowKeyConverterRule.INSTANCE); + return metaRuleset; + } +} Added: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java (rev 0) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -0,0 +1,24 @@ +package org.richfaces.taglib; + +import org.richfaces.view.facelets.RowKeyConverterRule; + +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.MetaRuleset; + +/** + * User: Gleb Galkin + * Date: 11.03.11 + */ +public class ListHandler extends ComponentHandler { + + public ListHandler(ComponentConfig config) { + super(config); + } + + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset metaRuleset = super.createMetaRuleset(type); + metaRuleset.addRule(RowKeyConverterRule.INSTANCE); + return metaRuleset; + } +} \ No newline at end of file Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java 2011-03-11 19:13:33 UTC (rev 22175) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java 2011-03-11 19:31:01 UTC (rev 22176) @@ -21,27 +21,19 @@ */ package org.richfaces.view.facelets; -import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_FACET_NAME; -import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_ID; +import com.google.common.base.Strings; +import org.richfaces.component.AbstractTree; +import org.richfaces.component.AbstractTreeNode; import javax.faces.application.Application; import javax.faces.component.UIComponent; import javax.faces.component.html.HtmlOutputText; import javax.faces.context.FacesContext; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.MetaRule; -import javax.faces.view.facelets.MetaRuleset; -import javax.faces.view.facelets.Metadata; -import javax.faces.view.facelets.MetadataTarget; -import javax.faces.view.facelets.TagAttribute; +import javax.faces.view.facelets.*; -import org.richfaces.component.AbstractTree; -import org.richfaces.component.AbstractTreeNode; +import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_FACET_NAME; +import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_ID; -import com.google.common.base.Strings; - /** * @author Nick Belaevski * @@ -72,6 +64,7 @@ protected MetaRuleset createMetaRuleset(Class type) { MetaRuleset metaRuleset = super.createMetaRuleset(type); metaRuleset.addRule(RULE); + metaRuleset.addRule(RowKeyConverterRule.INSTANCE); return metaRuleset; }