Author: echatellier Date: 2014-05-26 15:25:59 +0200 (Mon, 26 May 2014) New Revision: 96 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/96 Log: Use topia snapshot to use ordered association on enumeration Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-05-26 13:25:59 UTC (rev 96) @@ -29,11 +29,11 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; public abstract class AbstractFaxToMailTopiaDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { - public <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + public <K> List<K> find(String hql, Map<String, Object> hqlParameters, PaginationParameter pager) { return super.find(hql, hqlParameters, pager); } Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-26 13:25:59 UTC (rev 96) @@ -24,20 +24,19 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaIdFactory; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; import java.util.ArrayList; import java.util.Collection; @@ -57,9 +56,7 @@ public MailFolder getFolderForRecipient(String recipient) { MailFilterTopiaDao filterTopiaDao = getPersistenceContext().getMailFilterDao(); - TopiaPagerBean tpb = new TopiaPagerBean(); - tpb.setSortColumn(MailFilter.PROPERTY_POSITION); - tpb.setSortAscendant(true); + PaginationParameter tpb = PaginationParameter.of(-1, -1, MailFilter.PROPERTY_POSITION, false); String query = "FROM " + MailFilter.class.getCanonicalName() + " WHERE :recipient LIKE " + MailFilter.PROPERTY_EXPRESSION; Map<String, Object> params = new HashMap<>(); Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-26 13:25:59 UTC (rev 96) @@ -217,22 +217,22 @@ <groupId>org.webjars</groupId> <artifactId>angularjs</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>jstree</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>jquery</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> @@ -242,6 +242,11 @@ <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-utils</artifactId> + </dependency> </dependencies> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/pom.xml 2014-05-26 13:25:59 UTC (rev 96) @@ -105,7 +105,7 @@ <nuitonWebVersion>1.16</nuitonWebVersion> <eugeneVersion>2.9</eugeneVersion> - <topiaVersion>3.0-beta-4</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> @@ -523,6 +523,13 @@ <dependency> <groupId>org.webjars</groupId> + <artifactId>angular-ui-utils</artifactId> + <version>0.1.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> <artifactId>jstree</artifactId> <version>3.0.0</version> <scope>runtime</scope>