- Isis-fish-commits - mailman.cloud.codelutin.com

r3868 - trunk/src/main/resources/i18n
by bpoussin＠users.forge.codelutin.com 05 Dec '13

05 Dec '13

Author: bpoussin Date: 2013-12-05 15:37:17 +0100 (Thu, 05 Dec 2013) New Revision: 3868 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3868 Log: add traduction for isisfish.config.cache.backend.factory.class.description Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2013-12-01 22:09:03 UTC (rev 3867) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2013-12-05 14:37:17 UTC (rev 3868) @@ -137,6 +137,7 @@ isisfish.common.warn=warn isisfish.common.year=year isisfish.common.zone=Zone +isisfish.config.cache.backend.factory.class.description=Cache backend class to use for simulation isisfish.config.category.communityvcs=Community VCS isisfish.config.category.communityvcs.description=Community VCS repository isisfish.config.category.main=Main Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-12-01 22:09:03 UTC (rev 3867) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-12-05 14:37:17 UTC (rev 3868) @@ -137,6 +137,7 @@ isisfish.common.warn=Warning isisfish.common.year=année isisfish.common.zone=Zone +isisfish.config.cache.backend.factory.class.description=Implantation du cache à utiliser pour les simulations isisfish.config.category.communityvcs=VCS Communauté isisfish.config.category.communityvcs.description=Dépôt contenant les scripts de la communautés isisfish.config.category.main=Globale

1 0

r3867 - branches/4.0.1/src/main/resources/templates/script
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 23:09:03 +0100 (Sun, 01 Dec 2013) New Revision: 3867 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3867 Log: Change visibility Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl branches/4.0.1/src/main/resources/templates/script/export.ftl branches/4.0.1/src/main/resources/templates/script/rule.ftl branches/4.0.1/src/main/resources/templates/script/script.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl branches/4.0.1/src/main/resources/templates/script/simulator.ftl Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/equation.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/equation.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: branches/4.0.1/src/main/resources/templates/script/export.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/export.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/export.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -74,7 +74,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(${name}.class); - public String [] necessaryResult = { + protected String[] necessaryResult = { // put here all necessary result for this rule // example: // ResultName.MATRIX_BIOMASS, Modified: branches/4.0.1/src/main/resources/templates/script/rule.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/rule.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/rule.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -76,7 +76,7 @@ /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory.getLog(${name}.class); - public String [] necessaryResult = { + protected String[] necessaryResult = { // put here all necessary result for this rule // example: // ResultName.MATRIX_BIOMASS, Modified: branches/4.0.1/src/main/resources/templates/script/script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/script.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/script.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -74,7 +74,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(${name}.class); - public String [] necessaryResult = { + protected String[] necessaryResult = { // put here all necessary result for this rule // example: // ResultName.MATRIX_BIOMASS, Modified: branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -80,7 +80,7 @@ /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory.getLog(${name}.class); - public String [] necessaryResult = { + protected String[] necessaryResult = { // put here all necessary result for this rule // example: // ResultName.MATRIX_BIOMASS, Modified: branches/4.0.1/src/main/resources/templates/script/simulator.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2013-12-01 21:35:20 UTC (rev 3866) +++ branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2013-12-01 22:09:03 UTC (rev 3867) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2013 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as

1 0

r3866 - in trunk/src/main/java/fr/ifremer/isisfish: aspect simulator util
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 22:35:20 +0100 (Sun, 01 Dec 2013) New Revision: 3866 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3866 Log: Fix trunk compilation Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -39,7 +39,7 @@ import org.codehaus.aspectwerkz.joinpoint.MethodSignature; import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.util.Cache; +import fr.ifremer.isisfish.util.IsisCache; /** * CacheAspect aspect. @@ -69,9 +69,9 @@ * * @return trace object from context */ - protected Cache getCache() { + protected IsisCache getCache() { SimulationContext context = SimulationContext.get(); - Cache result = context.getCache(); + IsisCache result = context.getCache(); return result; } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Cache; +import fr.ifremer.isisfish.util.IsisCache; import fr.ifremer.isisfish.util.Trace; /** @@ -78,7 +78,7 @@ /** l'objet trace qui conserve les donnees statistiques des appels de methodes */ protected Trace trace; /** cache used by aspect for this simulation */ - protected Cache cache; + protected IsisCache cache; /** TopiaContext must be used by rule action to modify data */ protected TopiaContext db = null; @@ -208,10 +208,11 @@ return trace; } - public Cache getCache() { + public IsisCache getCache() { if (cache == null) { - cache = new Cache(); - }return cache; + cache = new IsisCache(); + } + return cache; } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -49,7 +49,7 @@ /** * to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(IsisCacheAbstract.class); + static private Log log = LogFactory.getLog(IsisCache.class); static public IsisCacheBackend.Factory defaultFactory = IsisCacheBackendOnGuava.factory;

1 0

r3865 - branches/4.0.1/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 22:26:43 +0100 (Sun, 01 Dec 2013) New Revision: 3865 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3865 Log: Revert Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-12-01 21:26:28 UTC (rev 3864) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-12-01 21:26:43 UTC (rev 3865) @@ -643,7 +643,7 @@ // using non recompiled script due to dependency changes // this is the better solution found : // remove isis build directory - FileUtils.deleteQuietly(IsisFish.config.getCompileDirectory()); + //FileUtils.deleteQuietly(IsisFish.config.getCompileDirectory()); ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); }

1 0

r3864 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 22:26:28 +0100 (Sun, 01 Dec 2013) New Revision: 3864 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3864 Log: Always set double value instead of string Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2013-12-01 21:25:30 UTC (rev 3863) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2013-12-01 21:26:28 UTC (rev 3864) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012, 2013 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -310,7 +310,9 @@ if (comp instanceof MatrixPanelEditor) { domain.addDistributionParam(param.getName(), ((MatrixPanelEditor)comp).getMatrix()); } else { - domain.addDistributionParam(param.getName(), ((JTextComponent)comp).getText().trim()); + // XXX echatellier 20131201 : always double type ? + String strValue = ((JTextComponent)comp).getText().trim(); + domain.addDistributionParam(param.getName(), Double.parseDouble(strValue)); } paramComponentIndex++;

1 0

r3863 - branches/4.0.1/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 22:25:30 +0100 (Sun, 01 Dec 2013) New Revision: 3863 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3863 Log: Nuiton version sait pas parser les versions Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-01 19:22:08 UTC (rev 3862) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-01 21:25:30 UTC (rev 3863) @@ -134,7 +134,7 @@ * @return full version */ static public String getVersion() { - String result = version.toString() + "beta1"; + String result = version.toString(); return result; }

1 0

r3862 - branches/4.0.1/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 01 Dec '13

01 Dec '13

Author: echatellier Date: 2013-12-01 20:22:08 +0100 (Sun, 01 Dec 2013) New Revision: 3862 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3862 Log: Uncomment build directory deletion Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-11-28 09:09:04 UTC (rev 3861) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-12-01 19:22:08 UTC (rev 3862) @@ -643,7 +643,7 @@ // using non recompiled script due to dependency changes // this is the better solution found : // remove isis build directory - //FileUtils.deleteQuietly(IsisFish.config.getCompileDirectory()); + FileUtils.deleteQuietly(IsisFish.config.getCompileDirectory()); ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause); }

1 0

r3861 - branches/4.0.1
by echatellier＠users.forge.codelutin.com 28 Nov '13

28 Nov '13

Author: echatellier Date: 2013-11-28 10:09:04 +0100 (Thu, 28 Nov 2013) New Revision: 3861 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3861 Log: Update hibernate Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-11-27 22:06:23 UTC (rev 3860) +++ branches/4.0.1/pom.xml 2013-11-28 09:09:04 UTC (rev 3861) @@ -486,7 +486,7 @@ <jaxxVersion>2.5.30</jaxxVersion> <eugeneVersion>2.6.3</eugeneVersion> <topiaVersion>2.8.1.3</topiaVersion> - <hibernateVersion>4.2.7.Final</hibernateVersion> + <hibernateVersion>4.2.7.SP1</hibernateVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r3860 - branches/4.0.1/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 27 Nov '13

27 Nov '13

Author: echatellier Date: 2013-11-27 23:06:23 +0100 (Wed, 27 Nov 2013) New Revision: 3860 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3860 Log: Move isis-database to beta folder to test it Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-11-27 22:05:47 UTC (rev 3859) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-11-27 22:06:23 UTC (rev 3860) @@ -134,7 +134,7 @@ * @return full version */ static public String getVersion() { - String result = version.toString(); + String result = version.toString() + "beta1"; return result; } @@ -950,7 +950,7 @@ public static enum Option implements ConfigOptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()), + ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()+"beta"), COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), "${isis.home.directory}" + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), "${isis.home.directory}" + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), "${isis.home.directory}" + File.separator + "isis-docs"),

1 0

r3859 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/ui/input/check src/main/java/fr/ifremer/isisfish/ui/script/model src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 27 Nov '13

27 Nov '13

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;

1 0