Author: abelevich Date: 2010-04-30 12:39:57 -0400 (Fri, 30 Apr 2010) New Revision: 16854 Added: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/dataTable.faces-config.xml Removed: root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/dataTable.faces-config.xml.xml root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/html/ Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/faces-config.xml root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/taglib/DatascrollerTagHandler.java Log: clear code Deleted: root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/dataTable.faces-config.xml.xml =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/dataTable.faces-config.xml.xml 2010-04-30 16:22:20 UTC (rev 16853) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/dataTable.faces-config.xml.xml 2010-04-30 16:39:57 UTC (rev 16854) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <name>richfaces</name> - <application> - <system-event-listener> - <system-event-listener-class>org.richfaces.event.DataTablePreRenderListener</system-event-listener-class> - <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class> - </system-event-listener> - </application> -</faces-config> Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/faces-config.xml =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/faces-config.xml 2010-04-30 16:22:20 UTC (rev 16853) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/config/faces-config.xml 2010-04-30 16:39:57 UTC (rev 16854) @@ -28,10 +28,9 @@ <component> <component-type>org.richfaces.DataScroller</component-type> - <component-class>org.richfaces.component.html.HtmlDataScroller</component-class> + <component-class>org.richfaces.component.UIDataScroller</component-class> <component-extension> <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... </component-extension> </component> - </faces-config> \ No newline at end of file Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-04-30 16:22:20 UTC (rev 16853) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-04-30 16:39:57 UTC (rev 16854) @@ -66,7 +66,6 @@ public static List<UIDataScroller> findDataScrollers(UIComponent dataTable) { List <UIDataScroller> datascrollers = new ArrayList<UIDataScroller>(); - Map<String, UIComponent> facets = dataTable.getFacets(); Set<Entry<String, UIComponent>> entries = facets.entrySet(); @@ -75,7 +74,6 @@ } UIComponent parent = findParentContainer(dataTable); - if(parent != null) { findBelow(parent, datascrollers); } @@ -87,6 +85,7 @@ protected static void findBelow(UIComponent component, List<UIDataScroller> result) { if((component instanceof UIDataScroller) && component.isRendered()) { result.add((UIDataScroller)component); + } else { for(UIComponent child: component.getChildren()) { if(!(child instanceof NamingContainer)) { @@ -94,5 +93,6 @@ } } } + } } Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-04-30 16:22:20 UTC (rev 16853) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-04-30 16:39:57 UTC (rev 16854) @@ -52,8 +52,7 @@ private Integer page; protected enum PropertyKeys { - boundaryControls, data, fastControls, fastStep, forComponent, handleValue, inactiveStyle, selectStyle, - inactiveStyleClass, selectStyleClass, scrollerListener, lastPageMode, maxPages, pageIndexVar, pagesVar, renderIfSinglePage, + boundaryControls, fastControls, fastStep, forComponent, inactiveStyle, selectStyle, inactiveStyleClass, selectStyleClass, scrollerListener, lastPageMode, maxPages, pageIndexVar, pagesVar, renderIfSinglePage, style, styleClass, stepControls } @@ -66,6 +65,46 @@ getStateHelper().put(PropertyKeys.lastPageMode, lastPageMode); } + public int getFastStep() { + return (Integer)getStateHelper().eval(PropertyKeys.fastStep, 0); + } + + public void setFastStep(int fastStep) { + getStateHelper().put(PropertyKeys.fastStep, fastStep); + } + + public String getFor() { + return (String)getStateHelper().eval(PropertyKeys.forComponent); + } + + public void setFor(String f) { + getStateHelper().put(PropertyKeys.forComponent, f); + } + + public int getMaxPages() { + return (Integer)getStateHelper().eval(PropertyKeys.maxPages,0); + } + + public void setMaxPages(int maxPages) { + getStateHelper().put(PropertyKeys.maxPages, maxPages); + } + + public String getBoundaryControls() { + return (String)getStateHelper().eval(PropertyKeys.boundaryControls, "show"); + } + + public void setBoundaryControls(String boundaryControls) { + getStateHelper().put(PropertyKeys.boundaryControls, boundaryControls); + } + + public String getFastControls() { + return (String)getStateHelper().eval(PropertyKeys.fastControls, "show"); + } + + public void setFastControls(String fastControls) { + getStateHelper().put(PropertyKeys.fastControls, fastControls); + } + public void addScrollerListener(DataScrollerListener listener) { addFacesListener(listener); } Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/taglib/DatascrollerTagHandler.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/taglib/DatascrollerTagHandler.java 2010-04-30 16:22:20 UTC (rev 16853) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/taglib/DatascrollerTagHandler.java 2010-04-30 16:39:57 UTC (rev 16854) @@ -58,16 +58,10 @@ private final TagAttribute page; - /** - * @param attribute - */ public PageMapper(TagAttribute attribute) { page = attribute; } - /* (non-Javadoc) - * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) - */ public void applyMetadata(FaceletContext ctx, Object instance) { UIDataScroller datascroller = (UIDataScroller) instance; ValueExpression ve = page.getValueExpression(ctx, int.class); Added: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/dataTable.faces-config.xml =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/dataTable.faces-config.xml (rev 0) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/dataTable.faces-config.xml 2010-04-30 16:39:57 UTC (rev 16854) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <name>richfaces</name> + <application> + <system-event-listener> + <system-event-listener-class>org.richfaces.event.DataTablePreRenderListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class> + </system-event-listener> + </application> +</faces-config>