Author: echatellier Date: 2013-11-27 23:05:47 +0100 (Wed, 27 Nov 2013) New Revision: 3859 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3859 Log: Update to commons-collections4 Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/pom.xml 2013-11-27 22:05:47 UTC (rev 3859) @@ -155,10 +155,11 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - + <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -33,7 +33,7 @@ import java.util.Set; import java.util.TreeSet; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.Result; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.vcs.VCSException; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -34,7 +34,8 @@ import java.util.List; import java.util.Set; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; @@ -59,8 +60,8 @@ import fr.ifremer.isisfish.simulator.SimulationException; import fr.ifremer.isisfish.simulator.SimulationPlan; import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; /** * Cette classe permet de conserver des résultats de simulation. Elle permet @@ -81,11 +82,11 @@ protected SimulationStorage simulation = null; // transient protected HashMap<String, MatrixND> globalMatrix = new HashMap<String, MatrixND>(); - transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); + transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.WEAK); /** cache to maintains some result. key: String(date + ':' + name), value: matrix * TODO: cache will be more efficient if it keep at min the number of result by year */ - transient protected ReferenceMap cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + transient protected ReferenceMap cache = new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.SOFT); /** contains all available result as string: String(date + ':' + name) */ transient protected Set<String> availableResult = null; /** result enabled */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -40,8 +40,8 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -35,9 +35,9 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.MultiKey; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.keyvalue.MultiKey; +import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.simulator; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.map.MultiKeyMap; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.rule.Rule; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -33,7 +33,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -36,7 +36,7 @@ import javax.swing.JComponent; import javax.swing.TransferHandler; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java 2013-11-27 21:53:58 UTC (rev 3858) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java 2013-11-27 22:05:47 UTC (rev 3859) @@ -28,7 +28,8 @@ import java.lang.reflect.Method; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.map.ReferenceMap; import org.aspectj.lang.ProceedingJoinPoint; import org.nuiton.topia.persistence.TopiaEntity; @@ -72,7 +73,7 @@ * Value est en SOFT reference pour que les valeurs soit effacee du cache * lorsqu'il n'y a plus de place memoire */ - protected Map cache = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD); + protected Map cache = new ReferenceMap(ReferenceStrength.WEAK, ReferenceStrength.HARD); // protected Map cache = new AdaptaptativeCache(1000, 95); public Cache() { @@ -167,7 +168,7 @@ } Map result = (Map)cache.get(key); if (result == null) { - result = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + result = new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.SOFT); cache.put(key, result); } return result;