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

r4148 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com 07 Dec '14

07 Dec '14

Author: echatellier Date: 2014-12-07 15:28:46 +0000 (Sun, 07 Dec 2014) New Revision: 4148 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4148 Log: Fix conditions Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2014-12-05 20:56:31 UTC (rev 4147) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2014-12-07 15:28:46 UTC (rev 4148) @@ -95,10 +95,10 @@ <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationRecruitmentEquationIsReproduction" buttonGroup="radioPopulationRecruitmentEquationType" - selected='{getBean().isReproductionEquationIsRecruitment()}' + selected='{!getBean().isReproductionEquationIsRecruitment()}' enabled='{isActive()}' text="isisfish.populationRecruitment.reproductionEquationIsReproduction" - onActionPerformed='getBean().setReproductionEquationIsRecruitment(!radioPopulationRecruitmentEquationIsRecruitment.isSelected())' + onActionPerformed='getBean().setReproductionEquationIsRecruitment(radioPopulationRecruitmentEquationIsRecruitment.isSelected())' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'>

1 0

r4147 - in trunk/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish test/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: echatellier Date: 2014-12-05 20:56:31 +0000 (Fri, 05 Dec 2014) New Revision: 4147 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4147 Log: Fix tests by clearing static caches Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -52,7 +52,7 @@ public static final String OBJECTIVE_TEMPLATE = "templates/script/objective.ftl"; /** Instance cache. */ - private static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); + protected static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -52,7 +52,7 @@ public static final String OPTIMIZATION_TEMPLATE = "templates/script/optimization.ftl"; /** Instance cache. */ - private static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); + protected static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -68,7 +68,7 @@ public static final String RULE_TEMPLATE = "templates/script/rule.ftl"; /** Instance cache. */ - private static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); + protected static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); /** * Contruit un nouveau rule storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -53,7 +53,7 @@ public static final String SCRIPT_TEMPLATE = "templates/script/script.ftl"; /** Instance cache. */ - static private Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); + static protected Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); /** * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -55,7 +55,7 @@ public static final String SENSITIVITY_EXPORT_TEMPLATE = "templates/script/sensitivityexport.ftl"; /** Instance cache. */ - private static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); + protected static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); /** * Constructeur. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -65,7 +65,7 @@ public static final String SIMULATION_PLAN_TEMPLATE = "templates/script/simulationplan.ftl"; /** Instance cache. */ - static private Map<String, SimulationPlanStorage> plansCache = new ReferenceMap<>(); + static protected Map<String, SimulationPlanStorage> plansCache = new ReferenceMap<>(); /** * Construit un nouveau SimulationPlan storage. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -54,7 +54,7 @@ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl"; /** Simulators cache. */ - static private Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); + static protected Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); /** * Constructeur. Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -37,6 +37,7 @@ import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.datastore.CodeSourceStorage.Location; +import fr.ifremer.isisfish.datastore.DataStorageTestHelper; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; @@ -100,7 +101,10 @@ // install a new topia migration service callback // to not ask for user for migration during test AutoMigrationIsisH2Config.setTestMigrationCallBack(); - + + // reset static caches + DataStorageTestHelper.clearAllCache(); + FileUtils.copyDirectory(new File("src/test/resources/test-database").getAbsoluteFile(), IsisFish.config.getDatabaseDirectory(), HiddenFileFilter.VISIBLE); } Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -38,26 +38,21 @@ */ @Ignore public class DataStorageTestHelper { - - /** - * Clear static simulation cache. - */ - public static void clearSimulationCache() { - SimulationStorage.simulations.clear(); - } /** - * Clear static region cache. - */ - public static void clearRegionCache() { - RegionStorage.regions.clear(); - } - - /** * Clear all static cache. + * + * Sans vider le cache certains test peuvent planter lors de l'execution de multiples test seulement. */ public static void clearAllCache() { - clearSimulationCache(); - clearRegionCache(); + ObjectiveStorage.objectiveCache.clear(); + OptimizationStorage.objectiveCache.clear(); + RegionStorage.regions.clear(); + RuleStorage.rulesCache.clear(); + ScriptStorage.scriptsCache.clear(); + SensitivityAnalysisStorage.sensitivityCache.clear(); + SimulationPlanStorage.plansCache.clear(); + SimulationStorage.simulations.clear(); + SimulatorStorage.simulatorsCache.clear(); } }

1 0

r4146 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: echatellier Date: 2014-12-05 20:37:49 +0000 (Fri, 05 Dec 2014) New Revision: 4146 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4146 Log: Fix migrations Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-12-04 15:23:18 UTC (rev 4145) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-12-05 20:37:49 UTC (rev 4146) @@ -103,10 +103,13 @@ tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); - // migration v 4.1.2 (mais necessaire de la faire avant sinon le findByTopiaId va planter + // migration v 4.1.2 (mais necessaire de la faire avant sinon le findByTopiaId va planter) tx.executeSQL("alter table POPULATION add column groupmin integer default 0"); tx.executeSQL("alter table POPULATION add column groupmax integer default 0"); + // migration v 4.4 (mais necessaire de la faire avant sinon le from va planter) + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS reproductionEquationIsRecruitment boolean default false"); + // build new equation for maturity group for (Object[] maturityRow : maturityGroupResult) { String population = (String)maturityRow[0];

1 0

r4145 - branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: echatellier Date: 2014-12-04 15:23:18 +0000 (Thu, 04 Dec 2014) New Revision: 4145 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4145 Log: Fix sensitivity export parameters Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java Modified: branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-12-04 15:16:06 UTC (rev 4144) +++ branches/isis-fish-4.3.1.x/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-12-04 15:23:18 UTC (rev 4145) @@ -1858,7 +1858,7 @@ result.setProperty(SimulationParameterPropertiesHelper.SENSITIVITY_EXPORTS_KEY, sensitivityexports); SimulationParameterPropertiesHelper.copy(propertiesParameters, result, - SimulationParameterPropertiesHelper.SENSITIVITY_EXPORTS_KEY + DOT); + SimulationParameterPropertiesHelper.SENSITIVITY_EXPORT_KEY + DOT); } } }

1 0

r4144 - in branches: . isis-fish-4.3.1.x
by echatellier＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: echatellier Date: 2014-12-04 15:16:06 +0000 (Thu, 04 Dec 2014) New Revision: 4144 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4144 Log: Create 4.3.1.X branche Added: branches/isis-fish-4.3.1.x/ Property changes on: branches/isis-fish-4.3.1.x ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670

1 0

r4143 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: echatellier Date: 2014-12-04 13:54:02 +0000 (Thu, 04 Dec 2014) New Revision: 4143 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4143 Log: Fix sensitivity export parameters Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-12-04 11:39:33 UTC (rev 4142) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-12-04 13:54:02 UTC (rev 4143) @@ -1874,7 +1874,7 @@ result.setProperty(SimulationParameterPropertiesHelper.SENSITIVITY_EXPORTS_KEY, sensitivityexports); SimulationParameterPropertiesHelper.copy(propertiesParameters, result, - SimulationParameterPropertiesHelper.SENSITIVITY_EXPORTS_KEY + DOT); + SimulationParameterPropertiesHelper.SENSITIVITY_EXPORT_KEY + DOT); } } }

1 0

r4142 - in trunk/src: main/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: echatellier Date: 2014-12-04 11:39:33 +0000 (Thu, 04 Dec 2014) New Revision: 4142 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4142 Log: Remove inner class from dependencies Modified: trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-12-03 16:23:03 UTC (rev 4141) +++ trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-12-04 11:39:33 UTC (rev 4142) @@ -241,6 +241,7 @@ * @param type type to add */ protected static void registerType(Set<String> types, String type) { + //System.out.println("==> " + type); if (StringUtils.startsWithAny(type, ExportStorage.EXPORT_PATH, @@ -253,8 +254,12 @@ SensitivityExportStorage.SENSITIVITY_EXPORT_PATH, SimulationPlanStorage.SIMULATION_PLAN_PATH, SimulatorStorage.SIMULATOR_PATH)) { - String dotType = type.replace('/', '.'); - types.add(dotType); + + // exclude inner types + if (!type.contains("$")) { + String dotType = type.replace('/', '.'); + types.add(dotType); + } } } Modified: trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-12-03 16:23:03 UTC (rev 4141) +++ trunk/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-12-04 11:39:33 UTC (rev 4142) @@ -159,4 +159,17 @@ Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.ObjectiveFunction")); } + + /** + * Test que les inners types (anonyme $1) ne sont pas extrait. + * + * @throws IsisFishException + * @throws IOException + */ + @Test + public void testExtractDependencies7() throws IsisFishException, IOException { + RuleStorage script = RuleStorage.getRule("GraviteVPUE1"); + Set<String> deps = extractDependencies(script); + Assert.assertFalse(deps.contains("rules.GraviteVPUE1$1")); + } }

1 0

r4141 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore/migration src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/ui/input src/main/resources/i18n src/test/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: echatellier Date: 2014-12-03 16:23:03 +0000 (Wed, 03 Dec 2014) New Revision: 4141 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4141 Log: Fix compilation Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/pom.xml 2014-12-03 16:23:03 UTC (rev 4141) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0-SNAPSHOT</version> + <version>4.4.0.0-SNAPSHOT</version>  <dependencies> @@ -513,9 +513,9 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.16.1</jaxxVersion> + <jaxxVersion>2.17</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>2.9.2</topiaVersion> + <topiaVersion>2.9.3</topiaVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2014 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 @@ -30,7 +30,8 @@ import javax.swing.JOptionPane; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -45,13 +46,13 @@ */ public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { - protected static final Version VERSION_32 = new Version("3.2"); - protected static final Version VERSION_33 = new Version("3.3"); - protected static final Version VERSION_40 = new Version("4.0"); - protected static final Version VERSION_41 = new Version("4.1"); - protected static final Version VERSION_421 = new Version("4.2.1"); - protected static final Version VERSION_43 = new Version("4.3"); - protected static final Version VERSION_44 = new Version("4.4"); + protected static final Version VERSION_32 = Versions.valueOf("3.2"); + protected static final Version VERSION_33 = Versions.valueOf("3.3"); + protected static final Version VERSION_40 = Versions.valueOf("4.0"); + protected static final Version VERSION_41 = Versions.valueOf("4.1"); + protected static final Version VERSION_421 = Versions.valueOf("4.2.1"); + protected static final Version VERSION_43 = Versions.valueOf("4.3"); + protected static final Version VERSION_44 = Versions.valueOf("4.4"); public DatabaseMigrationClass() { super(new MigrationResolver()); @@ -99,7 +100,7 @@ */ @Override public Version getApplicationVersion() { - Version appVersion = new Version(IsisFishDAOHelper.getModelVersion()); + Version appVersion = Versions.valueOf(IsisFishDAOHelper.getModelVersion()); return appVersion; } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 0 and 3.2. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 3.2 and 3.3. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2014 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 @@ -37,7 +37,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.entities.Equation; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 4.0 and 4.1. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 4.1 and 4.2.1. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 4.1 and 4.2.1. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 - 2014 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 @@ -29,7 +29,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Migration between version 4.3 and 4.4. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2014 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: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -317,10 +317,8 @@ Month month = info.getFirstMonth(); MatrixND CA = info.getGroupChangeMatrix(month); // poussin 20141203 never applicate migration (S.Mahevas, S.Lehuta) -// MatrixND MI = info.getMigrationMatrix(month, result); - MatrixND tmp0 = N.mult(CA); - MatrixND tmp2 = tmp0.mult(MI); - N = tmp2; + // MatrixND MI = info.getMigrationMatrix(month, result); + N = N.mult(CA); } result = pop.split2D(N); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2014-12-03 16:23:03 UTC (rev 4141) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2014 Ifremer, Code Lutin, 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 @@ -89,6 +89,9 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <Table> <row> + <cell> + <JPanel/> + </cell> <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationRecruitmentEquationIsReproduction" buttonGroup="radioPopulationRecruitmentEquationType" @@ -107,10 +110,11 @@ onActionPerformed='getBean().setReproductionEquationIsRecruitment(radioPopulationRecruitmentEquationIsRecruitment.isSelected())' decorator='boxed' /> </cell> - - <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> + </row> + <row> + <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> <InputOneEquationUI id='reproductionEquation' constructorParams='this' - text='isisfish.populationRecruitment.reproductionEquation' active="{isActive()}" + active="{isActive()}" bean='{getBean()}' formuleCategory='Reproduction' beanProperty='ReproductionEquation' clazz='{fr.ifremer.isisfish.equation.PopulationReproductionEquation.class}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"ReproductionEquation"'/> @@ -120,7 +124,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationRecruitment.monthgapgetweenreprorecruitment" enabled='{isActive()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell columns='2' fill='horizontal' weightx='1.0'>  <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-12-03 16:23:03 UTC (rev 4141) @@ -785,8 +785,8 @@ isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Month gap between repro and recruitment isisfish.populationRecruitment.recruitmentDistribution=Recruitment distribution isisfish.populationRecruitment.reproductionEquation=Reproduction equation +isisfish.populationRecruitment.reproductionEquationIsRecruitment=Stock/Recruitment isisfish.populationRecruitment.reproductionEquationIsReproduction=Reproduction -isisfish.populationRecruitment.reproductionEquationIsRecruitment=Stock/Recruitment isisfish.populationRecruitment.title=Recruitment isisfish.populationSeasonInfo.arrival=Arrival isisfish.populationSeasonInfo.departure=Departure Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-12-03 16:23:03 UTC (rev 4141) @@ -779,8 +779,8 @@ isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Nombre de mois entre ponte et recrutement isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement isisfish.populationRecruitment.reproductionEquation=Equation de reproduction +isisfish.populationRecruitment.reproductionEquationIsRecruitment=Equation de Stock/Recrutement isisfish.populationRecruitment.reproductionEquationIsReproduction=Equation de Reproduction -isisfish.populationRecruitment.reproductionEquationIsRecruitment=Equation de Stock/Recrutement isisfish.populationRecruitment.title=Reproductions isisfish.populationSeasonInfo.arrival=Arrivée isisfish.populationSeasonInfo.departure=Départ Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2014-12-03 14:13:19 UTC (rev 4140) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2014-12-03 16:23:03 UTC (rev 4141) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2014 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 @@ -27,7 +27,7 @@ import java.util.List; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Test migration callback for topia migration service.

1 0

r4140 - in trunk: . src/main/xmi
by bpoussin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: bpoussin Date: 2014-12-03 14:13:19 +0000 (Wed, 03 Dec 2014) New Revision: 4140 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4140 Log: - change to version 4.4-SNAPSHOT - add boolean to know is repro equation is recruitment or not Modified: trunk/pom.xml trunk/src/main/xmi/isis-fish.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-12-03 14:08:40 UTC (rev 4139) +++ trunk/pom.xml 2014-12-03 14:13:19 UTC (rev 4140) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.2.0-SNAPSHOT</version> + <version>4.4.0-SNAPSHOT</version>  <dependencies> Modified: trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)

1 0

r4139 - trunk/src/main/resources/i18n
by bpoussin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: bpoussin Date: 2014-12-03 14:08:40 +0000 (Wed, 03 Dec 2014) New Revision: 4139 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4139 Log: add translation for: - isisfish.populationRecruitment.reproductionEquationIsReproduction - isisfish.populationRecruitment.reproductionEquationIsRecruitment 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 2014-12-03 14:04:24 UTC (rev 4138) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-12-03 14:08:40 UTC (rev 4139) @@ -785,6 +785,8 @@ isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Month gap between repro and recruitment isisfish.populationRecruitment.recruitmentDistribution=Recruitment distribution isisfish.populationRecruitment.reproductionEquation=Reproduction equation +isisfish.populationRecruitment.reproductionEquationIsReproduction=Reproduction +isisfish.populationRecruitment.reproductionEquationIsRecruitment=Stock/Recruitment isisfish.populationRecruitment.title=Recruitment isisfish.populationSeasonInfo.arrival=Arrival isisfish.populationSeasonInfo.departure=Departure Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-12-03 14:04:24 UTC (rev 4138) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-12-03 14:08:40 UTC (rev 4139) @@ -779,6 +779,8 @@ isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Nombre de mois entre ponte et recrutement isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement isisfish.populationRecruitment.reproductionEquation=Equation de reproduction +isisfish.populationRecruitment.reproductionEquationIsReproduction=Equation de Reproduction +isisfish.populationRecruitment.reproductionEquationIsRecruitment=Equation de Stock/Recrutement isisfish.populationRecruitment.title=Reproductions isisfish.populationSeasonInfo.arrival=Arrivée isisfish.populationSeasonInfo.departure=Départ

1 0