Author: bleny Date: 2013-03-27 11:31:14 +0100 (Wed, 27 Mar 2013) New Revision: 46 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: make storage movement order keep storage movement in order in db Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 10:18:04 UTC (rev 45) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 10:31:14 UTC (rev 46) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.persistence.StorageMovements; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -33,6 +34,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import java.util.List; import java.util.Set; @Entity @@ -52,20 +55,21 @@ } @OneToMany(cascade = CascadeType.ALL) - protected Set<StorageMovement> storageMovements; + @OrderColumn + protected List<StorageMovement> storageMovements; - public Set<StorageMovement> getStorageMovements() { + public List<StorageMovement> getStorageMovements() { return storageMovements; } - public void setStorageMovements(Set<StorageMovement> storageMovements) { + public void setStorageMovements(List<StorageMovement> storageMovements) { this.storageMovements = storageMovements; } /** * @deprecated use {@link #getStorageMovements()} */ - public Set<StorageMovement> getSites() { + public List<StorageMovement> getSites() { return storageMovements; } @@ -95,7 +99,7 @@ public void addStorageMovement(StorageMovement storageMovement) { if (storageMovements == null) { - storageMovements = Sets.newLinkedHashSet(); + storageMovements = Lists.newLinkedList(); } storageMovements.add(storageMovement); }