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> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> @@ -513,9 +513,9 @@ <signatureVersion>1.0</signatureVersion> <!-- Dependencies version --> - <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'> <!--NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this' bean='{getBean()}' property='monthGapBetweenReproRecrutement' useSign='true' enabled='{isActive()}' decorator='boxed' _sensitivityBean='{PopulationImpl.class}' @@ -134,7 +138,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActive()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='0.5'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean() == null ? null : bean.getRecruitmentDistribution().copy()}' enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"RecruitmentDistribution"' @@ -145,7 +149,7 @@ <cell> <JPanel/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='getAction().createRecruitmentDistribution(getBean())' enabled='{isActive()}' decorator='boxed'/> </cell> </row> @@ -153,7 +157,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationRecruitment.comments" enabled='{isActive()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='0.3'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> <!-- jaxx.runtime.SwingUtil.getStringValue() comment can be null --> <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.