Author: abelevich Date: 2010-04-02 11:11:48 -0400 (Fri, 02 Apr 2010) New Revision: 16710 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/component/UIDataScroller.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java Log: refactor 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-02 15:11:08 UTC (rev 16709) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-04-02 15:11:48 UTC (rev 16710) @@ -38,8 +38,7 @@ } public static int getRows(UIComponent component) { - int row = 0; - row = (Integer)component.getAttributes().get("rows"); + int row = (Integer)component.getAttributes().get("rows"); if (row == 0) { row = getRowCount(component); } @@ -89,15 +88,11 @@ if((component instanceof UIDataScroller) && component.isRendered()) { result.add((UIDataScroller)component); } else { - for(UIComponent child: component.getChildren()) { if(!(child instanceof NamingContainer)) { findBelow(child, result); } } - } } - - } 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-02 15:11:08 UTC (rev 16709) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-04-02 15:11:48 UTC (rev 16710) @@ -45,6 +45,10 @@ public static final String LAST_DISABLED_FACET_NAME = "last_disabled"; + public static final String PAGEMODE_FULL = "full"; + + public static final String PAGEMODE_SHORT = "short"; + private Integer page; protected enum PropertyKeys { @@ -53,10 +57,7 @@ style, styleClass, stepControls } - public enum PageMode { - full, part - } - + public String getLastPageMode() { return (String)getStateHelper().eval(PropertyKeys.lastPageMode); } @@ -269,8 +270,8 @@ Integer pageObject = (Integer) ve.getValue(getFacesContext().getELContext()); if (pageObject != null) { - return pageObject; - } + return pageObject; + } } catch (ELException e) { throw new FacesException(e); } Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-04-02 15:11:08 UTC (rev 16709) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-04-02 15:11:48 UTC (rev 16710) @@ -4,11 +4,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; import javax.el.ValueExpression; -import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIData; import javax.faces.context.FacesContext; @@ -20,7 +17,6 @@ import org.richfaces.DataScrollerUtils; import org.richfaces.component.UIDataAdaptor; import org.richfaces.component.UIDataScroller; -import org.richfaces.component.UIDataScroller.PageMode; import org.richfaces.component.util.MessageUtil; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; @@ -29,14 +25,13 @@ private static final Logger log = RichfacesLogger.COMPONENTS.getLogger(); + @Override public boolean isListenerForSource(Object source) { return ((source instanceof UIDataAdaptor) || (source instanceof UIData)); } - public UIDataScroller processActiveDatascroller(FacesContext facesContext, List<UIDataScroller> dataScrollers, UIComponent dataTable) { - UIDataScroller activeComponent = null; List<Object> values = new ArrayList<Object>(dataScrollers.size()); @@ -77,9 +72,9 @@ } if (!valid) { - //TODO: anton - test debug String formattedMessage = getPageDifferentMessage(facesContext, activeComponent, dataScrollers, values); log.error(formattedMessage); + } return activeComponent; @@ -113,7 +108,7 @@ if (newPage != -1) { Object label = MessageUtil.getLabel(facesContext, activeComponent); String formattedMessage = Messages.getMessage(Messages.DATASCROLLER_PAGE_MISSING, new Object[] {label, page, pageCount, newPage}); - //TODO: anton - test debug + log.warn(formattedMessage); page = newPage; @@ -126,12 +121,13 @@ String lastPageMode = activeComponent.getLastPageMode(); if (lastPageMode == null) { - lastPageMode = PageMode.part.toString(); - } else if (!PageMode.part.equals(lastPageMode) && !PageMode.full.equals(lastPageMode)) { + lastPageMode = UIDataScroller.PAGEMODE_SHORT; + } else if (!UIDataScroller.PAGEMODE_SHORT.equals(lastPageMode) + && !UIDataScroller.PAGEMODE_FULL.equals(lastPageMode)) { throw new IllegalArgumentException("Illegal value of 'lastPageMode' attribute: '" + lastPageMode + "'"); } - if (page != pageCount || PageMode.part.equals(lastPageMode)) { + if (page != pageCount || UIDataScroller.PAGEMODE_SHORT.equals(lastPageMode)) { first = (page - 1) * rows; } else { first = rowCount - rows;