Author: athimel Date: 2014-02-04 17:35:06 +0100 (Tue, 04 Feb 2014) New Revision: 3002 Url: http://nuiton.org/projects/topia/repository/revisions/3002 Log: fixes #3061 Remove dependency to commons-collections 3 Modified: trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-02-04 13:14:53 UTC (rev 3001) +++ trunk/topia-persistence/pom.xml 2014-02-04 16:35:06 UTC (rev 3002) @@ -58,13 +58,7 @@ <artifactId>guava</artifactId> </dependency> - <!-- FIXME tchemit 2014-02-04 Remove this soon --> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java 2014-02-04 13:14:53 UTC (rev 3001) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java 2014-02-04 16:35:06 UTC (rev 3002) @@ -24,11 +24,11 @@ * #L% */ -import org.apache.commons.collections.map.IdentityMap; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; import java.util.EventObject; +import java.util.IdentityHashMap; import java.util.Map; import java.util.Set; @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; - private Map<TopiaEntity, EntityState> entities = new IdentityMap(); + private Map<TopiaEntity, EntityState> entities = new IdentityHashMap<TopiaEntity, EntityState>(); public TopiaTransactionEvent(TopiaPersistenceContext source) { super(source); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java 2014-02-04 13:14:53 UTC (rev 3001) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java 2014-02-04 16:35:06 UTC (rev 3002) @@ -29,12 +29,12 @@ import java.beans.PropertyChangeSupport; import java.beans.VetoableChangeSupport; import java.util.HashSet; +import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.map.IdentityMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaJpaSupport; @@ -72,7 +72,7 @@ final static Object NO_CHANGE = new Object(); /** used to collect entity modification during transaction */ - protected Map<TopiaEntity, EntityState> transactionEntities = new IdentityMap(); + protected Map<TopiaEntity, EntityState> transactionEntities = new IdentityHashMap<TopiaEntity, EntityState>(); protected Set<PropertyChangeListener> propertyChangeListeners = new HashSet<PropertyChangeListener>();