[richfaces-svn-commits] JBoss Rich Faces SVN: r20811 - in trunk/ui/iteration/ui/src/main/java/org/richfaces: component and 1 other directories.

Author: abelevich Date: 2010-12-27 10:41:34 -0500 (Mon, 27 Dec 2010) New Revision: 20811 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/DataScrollerUtils.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTableToggler.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java trunk/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java Log: RF-9939, RF-9944 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/DataScrollerUtils.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-12-27 14:48:05 UTC (rev 20810) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-12-27 15:41:34 UTC (rev 20811) @@ -99,7 +99,7 @@ public static UIComponent findDataTable(AbstractDataScroller dataScroller) { - String forAttribute = dataScroller.getForComponent(); + String forAttribute = dataScroller.getFor(); UIComponent forComp; if (forAttribute == null) { forComp = dataScroller; Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTableToggler.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTableToggler.java 2010-12-27 14:48:05 UTC (rev 20810) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTableToggler.java 2010-12-27 15:41:34 UTC (rev 20811) @@ -48,10 +48,6 @@ public static final String DEFAULT_EVENT = "onclick"; - enum PropertyKeys { - forId - } - @Attribute public abstract String getExpandLabel(); @@ -66,12 +62,13 @@ @Attribute(defaultValue = DEFAULT_EVENT) public abstract String getEvent(); - + + @Attribute public String getFor() { - return (String)getStateHelper().eval(PropertyKeys.forId); + return (String)getStateHelper().eval("for"); } public void setFor(String forId) { - getStateHelper().put(PropertyKeys.forId, forId); + getStateHelper().put("for", forId); } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2010-12-27 14:48:05 UTC (rev 20810) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2010-12-27 15:41:34 UTC (rev 20811) @@ -91,9 +91,6 @@ @Attribute public abstract String getLastPageMode(); - @Attribute - public abstract String getForComponent(); - @Attribute(defaultValue="10") public abstract int getMaxPages(); @@ -108,7 +105,16 @@ @Attribute(defaultValue="1") public abstract int getFastStep(); + + @Attribute + public String getFor() { + return (String)getStateHelper().eval("for"); + } + public void setFor(String forId) { + getStateHelper().put("for", forId); + } + public void addScrollerListener(DataScrollerListener listener) { addFacesListener(listener); } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java 2010-12-27 14:48:05 UTC (rev 20810) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java 2010-12-27 15:41:34 UTC (rev 20811) @@ -116,7 +116,6 @@ MetaRuleset ruleset = super.createMetaRuleset(type); ruleset.addRule(PAGERULE); ruleset.addRule(SCROLL_LISTENER_RULE); - ruleset.alias("for", "forComponent"); return ruleset; } }