[richfaces-svn-commits] JBoss Rich Faces SVN: r1517 - in branches/3.0.2/richfaces-samples/datascroller-sample/src/main: webapp/pages and 1 other directory.

Author: A.Skokov Date: 2007-07-06 08:09:11 -0400 (Fri, 06 Jul 2007) New Revision: 1517 Modified: branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp Log: http://jira.jboss.com/jira/browse/RF-409 Modified: branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java =================================================================== --- branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-07-06 12:09:05 UTC (rev 1516) +++ branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-07-06 12:09:11 UTC (rev 1517) @@ -27,7 +27,7 @@ import org.richfaces.event.DataScrollerEvent; public class TestBean { - + private ArrayList data; private ArrayList data1; private ArrayList data2; @@ -38,9 +38,11 @@ public boolean renderIfSinglePage; public int rows; public int maxpage; + private int actionCount; + private int eventCount; - - public TestBean () { + + public TestBean () { renderIfSinglePage=true; renderIfSinglePage=true; @@ -48,31 +50,45 @@ maxpage=10; data = new ArrayList(); - for (int i = 0; i < 10; i++) data.add(new Entry(null,i)); + for (int i = 0; i < 10; i++) { + data.add(new Entry(null, i)); + } data1 = new ArrayList(); - for (int i = 0; i < 11; i++) data1.add(new Entry(null,i)); + for (int i = 0; i < 11; i++) { + data1.add(new Entry(null, i)); + } data2 = new ArrayList(); - for (int i = 0; i < 12; i++) data2.add(new Entry(null,i)); + for (int i = 0; i < 12; i++) { + data2.add(new Entry(null, i)); + } data3 = new ArrayList(); - for (int i = 0; i < 13; i++) data3.add(new Entry(null,i)); + for (int i = 0; i < 13; i++) { + data3.add(new Entry(null, i)); + } data4 = new ArrayList(); - for (int i = 0; i < 14; i++) data4.add(new Entry(null,i)); + for (int i = 0; i < 14; i++) { + data4.add(new Entry(null, i)); + } data5 = new ArrayList(); - for (int i = 0; i < 15; i++) data5.add(new Entry(null,i)); + for (int i = 0; i < 15; i++) { + data5.add(new Entry(null, i)); + } data6 = new ArrayList(); - for (int i = 0; i < 16; i++) data6.add(new Entry(null,i)); + for (int i = 0; i < 16; i++) { + data6.add(new Entry(null, i)); + } } - - - public void setRenderIfSinglePage(boolean renderIfSinglePage){ + + + public void setRenderIfSinglePage(boolean renderIfSinglePage){ this.renderIfSinglePage = renderIfSinglePage; } @@ -80,17 +96,17 @@ return this.renderIfSinglePage; } - public void setRows(int rows){ - + public void setRows(int rows){ + this.rows = rows; } public int getRows() { - + return this.rows; } - public void setMaxpage(int maxpage){ + public void setMaxpage(int maxpage){ this.maxpage = maxpage; } @@ -101,15 +117,16 @@ public void onAction(ActionEvent actionEvent) { System.out.println("TestBean.onAction() " + actionEvent); + actionCount++; } - - + + public void doScroll(DataScrollerEvent event) { String oldScrolVal = event.getOldScrolVal(); String newScrolVal = event.getNewScrolVal(); System.out.println("Old Value = " + oldScrolVal + " " + "New Value = " + newScrolVal); - + eventCount++; } @@ -174,10 +191,23 @@ return data6; } - - public void setData6(ArrayList data) { this.data6 = data; } + public int getActionCount() { + return actionCount; + } + + public void setActionCount(int actionCount) { + this.actionCount = actionCount; + } + + public int getEventCount() { + return eventCount; + } + + public void setEventCount(int eventCount) { + this.eventCount = eventCount; + } } Modified: branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp =================================================================== --- branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-07-06 12:09:05 UTC (rev 1516) +++ branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-07-06 12:09:11 UTC (rev 1517) @@ -13,13 +13,13 @@ <body> <f:view> <h:form> - + <h:selectOneRadio binding="#{skinBean.component}" /> <h:commandLink action="#{skinBean.change}" value="set skin" /> <br/><br/> - + <h:outputText value="Data Table test" /> <br /> @@ -37,7 +37,7 @@ <h:outputText value="#{data.number1}" /> <f:facet name="footer"> <h:outputText value="Number 1 end" /> - </f:facet> + </f:facet> </h:column> <h:column> <f:facet name="header"> @@ -46,7 +46,7 @@ <h:outputText value="#{data.number2}" /> <f:facet name="footer"> <h:outputText value="Number 2 end" /> - </f:facet> + </f:facet> </h:column> <h:column> <f:facet name="header"> @@ -55,28 +55,35 @@ <h:outputText value="#{data.number3}" /> <f:facet name="footer"> <h:outputText value="Number 3 end" /> - </f:facet> + </f:facet> </h:column> <f:facet name="footer"> - <ds:datascroller for="master" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/> + <ds:datascroller for="master" reRender="actionCount, eventCount" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/> </f:facet> </h:dataTable> - <br /> + <br /> + <h:outputText value="Actions:" style="font-weight: bold;" /> + <h:outputText id="actionCount" value="#{testBean.actionCount}" /> + <br /> + <h:outputText value="Events:" style="font-weight: bold;" /> + <h:outputText id="eventCount" value="#{testBean.eventCount}" /> + <br /> - <h:panelGrid columns="2" border="0"> + <h:panelGrid columns="2" border="0"> + <h:outputText value="render if single page" style="font-weight: bold;" /> - <h:inputText value="#{testBean.renderIfSinglePage}"/> - + <h:inputText value="#{testBean.renderIfSinglePage}"/> + <h:outputText value="Rows" style="font-weight: bold;" /> - <h:inputText value="#{testBean.rows}"/> - + <h:inputText value="#{testBean.rows}"/> + <h:outputText value="Max page" style="font-weight: bold;" /> - <h:inputText value="#{testBean.maxpage}"/> + <h:inputText value="#{testBean.maxpage}"/> - </h:panelGrid> + </h:panelGrid> <h:commandLink value="apply" />