Author: bbrossaud Date: 2010-08-13 17:19:56 +0200 (Fri, 13 Aug 2010) New Revision: 50 Url: http://chorem.org/repositories/revision/billy/50 Log: pagination works well Modified: trunk/billy-ui-zk/pom.xml trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyBandboxMacro.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyModel.java trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java trunk/pom.xml Modified: trunk/billy-ui-zk/pom.xml =================================================================== --- trunk/billy-ui-zk/pom.xml 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/billy-ui-zk/pom.xml 2010-08-13 15:19:56 UTC (rev 50) @@ -74,6 +74,16 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> </dependencies> Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CategoryController.java 2010-08-13 15:19:56 UTC (rev 50) @@ -13,6 +13,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zk.ui.event.ForwardEvent; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; @@ -104,8 +105,8 @@ createCategoryFormWindow(null); } - public void onPaging$categoryPaging(Event event) { - PagingEvent pagingEvent = (PagingEvent) event; + public void onPaging$categoryPaging(ForwardEvent event) { + PagingEvent pagingEvent = (PagingEvent) event.getOrigin(); int activePage = pagingEvent.getActivePage(); categoryModel.setActivePage(activePage); } Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyBandboxMacro.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyBandboxMacro.java 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyBandboxMacro.java 2010-08-13 15:19:56 UTC (rev 50) @@ -19,7 +19,7 @@ public class CompanyBandboxMacro extends HtmlMacroComponent { - private final int pageSize = 5; + protected final int pageSize = 5; protected WikittyProxy proxy = ChoremDataProxy.getInstance(); protected CompanyModel companyModel = new CompanyModel(pageSize); Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyModel.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyModel.java 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CompanyModel.java 2010-08-13 15:19:56 UTC (rev 50) @@ -5,7 +5,6 @@ import org.chorem.billy.ui.ChoremDataProxy; import org.chorem.data.bonzoms.Company; -import org.chorem.data.bonzoms.Project; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.WikittyProxy; @@ -40,7 +39,7 @@ @Override public int indexOf(Object obj) { int index = -1; - String id = ((Project) obj).getWikittyId(); + String id = ((Company) obj).getWikittyId(); for (Company data : companies) { String dataId = data.getWikittyId(); if (id.equals(dataId)) { Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/InvoiceController.java 2010-08-13 15:19:56 UTC (rev 50) @@ -19,6 +19,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zk.ui.event.ForwardEvent; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; @@ -205,8 +206,8 @@ createInvoiceFormWindow(null); } - public void onPaging$invoicePaging(Event event) { - PagingEvent pagingEvent = (PagingEvent) event; + public void onPaging$invoicePaging(ForwardEvent event) { + PagingEvent pagingEvent = (PagingEvent) event.getOrigin(); int activePage = pagingEvent.getActivePage(); invoiceModel.setActivePage(activePage); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-13 12:14:25 UTC (rev 49) +++ trunk/pom.xml 2010-08-13 15:19:56 UTC (rev 50) @@ -102,6 +102,12 @@ <!-- dependencies for billy-zk --> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuiton-utils.version}</version> + </dependency> + + <dependency> <groupId>org.chorem.chorem-data</groupId> <artifactId>data-bonzoms</artifactId> <version>${chorem-data.version}</version> @@ -229,12 +235,13 @@ <!-- Nuiton librairies --> <topia.version>2.2.0</topia.version> <generator.version>1.0.0</generator.version> + <nuiton-utils.version>1.3.2-SNAPSHOT</nuiton-utils.version> <!-- ChoReg --> <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> <!-- commons-lang for ToPIA --> - <lang.version>2.4</lang.version> + <lang.version>2.5</lang.version> <!-- Hibernate for ToPIA --> <hibernate.version>3.3.1.GA</hibernate.version>