Author: abelevich Date: 2010-04-02 11:13:12 -0400 (Fri, 02 Apr 2010) New Revision: 16711 Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml Log: Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-04-02 15:11:48 UTC (rev 16710) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-04-02 15:13:12 UTC (rev 16711) @@ -1,7 +1,9 @@ package org.richfaces.demo; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; @@ -15,16 +17,36 @@ @SessionScoped public class DataBean { - DataComponentState componentState; + DataComponentState dataTableState; - public DataComponentState getComponentState() { - return componentState; + Map<Object,Integer> stateMap = new HashMap<Object, Integer>(); + + int page = 1; + + public int getPage() { + return page; } - public void setComponentState(DataComponentState componentState) { - this.componentState = componentState; + public void setPage(int page) { + this.page = page; } + public Map<Object, Integer> getStateMap() { + return stateMap; + } + + public void setStateMap(Map<Object, Integer> stateMap) { + this.stateMap = stateMap; + } + + public DataComponentState getDataTableState() { + return dataTableState; + } + + public void setDataTableState(DataComponentState dataTableState) { + this.dataTableState = dataTableState; + } + private List<Employee> employeeList; private boolean state = true; Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-04-02 15:11:48 UTC (rev 16710) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-04-02 15:13:12 UTC (rev 16711) @@ -14,17 +14,14 @@ <h:body> <h:form id="form1"> - - <rich:dataTable id="richTable" var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single"> + <ds:dataScroller id="scroller1" for="richTable" page="#{dataBean.page}" maxPages="7"></ds:dataScroller > + + <rich:dataTable id="richTable" var="record" rowKeyVar="rowKey" value="#{dataBean.employeeList}" rows="20" sortMode="single"> <f:facet name="caption"> <h:outputText id="captioFacet1" value="Caption Facet" /> </f:facet> - <f:facet name="header"> - <rich:colGroup id="headerFacet1"> - <rich:column><h:outputText id="headerFacet12" value="header column 1"> </h:outputText></rich:column> - <rich:column><h:outputText id="headerFacet13" value="header column 2"></h:outputText></rich:column> - <rich:column><h:outputText id="headerFacet14" value="header column 3"></h:outputText></rich:column> - </rich:colGroup> + <f:facet name="header"> + <h:outputText value="header facet"/> </f:facet> <rich:column id="column_name" sortBy="#{record.name}" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif"> <f:facet name="header"> @@ -50,7 +47,7 @@ <rich:subTable id="expandedSubTable" var="company" value="#{record.companies}" rows="1" switchType="ajax" expanded="true"> <f:facet name="header"> - <ds:dataScroller id="subscroller" for="expandedSubTable" maxPages="3"></ds:dataScroller > + <ds:dataScroller id="subscroller" for="expandedSubTable" page="#{dataBean.stateMap[rowKey]}" maxPages="3"></ds:dataScroller > </f:facet> <f:facet name="footer"> @@ -71,12 +68,11 @@ </rich:subTable> <f:facet name="footer"> - <h:outputText id="footerFacet1" value="Footer Facet" /> + <ds:dataScroller id="scroller3" for="richTable" page="#{dataBean.page}" maxPages="7"></ds:dataScroller > </f:facet> </rich:dataTable> - <ds:dataScroller id="scroller" for="richTable" maxPages="7"></ds:dataScroller > - + <br/> <h:commandButton value="submit" /> </h:form>