Author: echatellier Date: 2014-04-15 16:19:37 +0200 (Tue, 15 Apr 2014) New Revision: 3954 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3954 Log: Update libs Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/pom.xml 2014-04-15 14:19:37 UTC (rev 3954) @@ -20,21 +20,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.7.1</version> + <version>3.0-rc-2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-rc-1</version> <scope>compile</scope> <exclusions> <exclusion> @@ -478,7 +478,7 @@ <signatureVersion>1.0</signatureVersion> <!-- Dependencies version --> - <jaxxVersion>2.6</jaxxVersion> + <jaxxVersion>2.8.4</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> @@ -516,6 +516,14 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin> <plugin> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -1,5 +1,32 @@ package fr.ifremer.isisfish.simulator.launcher; +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import static org.nuiton.i18n.I18n.t; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -9,7 +36,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -21,13 +47,6 @@ import fr.ifremer.isisfish.simulator.OptimizationContext; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; -import java.io.File; -import java.io.IOException; -import java.util.List; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; /** * Permet de generer l'enchainement des simulations d'optimisation. @@ -129,9 +148,9 @@ // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { - log.error(I18n._("isisfish.error.evaluate.optimization.script"), eee); + log.error(t("isisfish.error.evaluate.optimization.script"), eee); } - throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.optimization.script"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.optimization.script"), eee); } finally { // on enleve le master plan des simulations en cours, vu que // toutes les simu sont terminees (correctement ou echouee) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -1,5 +1,31 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + package fr.ifremer.isisfish.simulator.launcher; +import static org.nuiton.i18n.I18n.t; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -61,9 +87,9 @@ // we are in a thread, IsisFishRuntimeException is displayed // outside a log if (log.isErrorEnabled()) { - log.error(I18n._("isisfish.error.evaluate.preplan.script"), eee); + log.error(t("isisfish.error.evaluate.preplan.script"), eee); } - throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.preplan.script"), eee); + throw new IsisFishRuntimeException(t("isisfish.error.evaluate.preplan.script"), eee); } } @@ -119,7 +145,7 @@ subJobN = subJobNp1; } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(I18n._("Can't add simulation: %s", job.getItem().getControl().getId()), eee); + log.error(t("Can't add simulation: %s", job.getItem().getControl().getId()), eee); } } } @@ -148,7 +174,7 @@ // this start a 0 int planNumber = planContext.getNumber(); if (planNumber > SimulationService.MAX_PLAN_SIMULATION) { - log.error(I18n._("Analyse plan error, too many simulation for %s : %s", id, planNumber)); + log.error(t("Analyse plan error, too many simulation for %s : %s", id, planNumber)); doNext = false; result = false; } else { @@ -186,7 +212,7 @@ sim.closeStorage(); // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtils.deleteQuietly(tmpDirectory)) { - log.warn(I18n._("isisfish.error.remove.directory", tmpDirectory)); + log.warn(t("isisfish.error.remove.directory", tmpDirectory)); } } // increment number for next simulation job @@ -228,7 +254,7 @@ boolean result = plan.afterSimulation(planContext, sim); doNext = doNext && result; } catch (Exception eee) { - log.error(I18n._("Stop simulation plan, because can't call afterSimulation correctly on plan %s", plan.getClass().getName()), eee); + log.error(t("Stop simulation plan, because can't call afterSimulation correctly on plan %s", plan.getClass().getName()), eee); doNext = false; } } Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-15 14:19:37 UTC (rev 3954) @@ -298,6 +298,7 @@ isisfish.error.errorpane.htmlmessage=<html><b>IsisFish has handled \:</b><br />%s</b></html> isisfish.error.errorpane.title=Error isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.optimization.script= isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist @@ -655,9 +656,13 @@ isisfish.month.november=november isisfish.month.october=october isisfish.month.september=september +isisfish.observation.comment= +isisfish.observation.name= +isisfish.observation.value= isisfish.optimisation.observation= isisfish.optimization.export= isisfish.optimization.exports= +isisfish.optimization.method= isisfish.optimization.methodfactorsupported= isisfish.optimization.objective= isisfish.optimization.objectives= @@ -699,6 +704,7 @@ isisfish.params.toString.strategies=Strategies \: isisfish.params.toString.use.cache=Use simulation cache isisfish.params.toString.use.optimization=Use optimization method +isisfish.params.useOptimization= isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan isisfish.population.capturability=Capturability Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-15 14:19:37 UTC (rev 3954) @@ -298,6 +298,7 @@ isisfish.error.errorpane.htmlmessage=<html><b>IsisFish a détecté une erreur \:</b><br />%s</b></html> isisfish.error.errorpane.title=Erreur isisfish.error.evaluate.equation=Impossible d'évaluer l'équation\: %1$s +isisfish.error.evaluate.optimization.script= isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.entity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.HeadlessException; import java.util.ArrayList; @@ -108,7 +108,7 @@ public void run() { JOptionPane.showMessageDialog(dialog, panel, - _("Spacialized visualisation"), + t("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); } @@ -189,7 +189,7 @@ public void run() { JOptionPane.showMessageDialog(dialog, box, - _("Spacialized visualisation"), + t("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.types; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.LinkedList; import java.util.List; @@ -78,12 +78,12 @@ MatrixND tmp = MatrixFactory.getInstance().create( "test", new List[] { monthList }, - new String[] { _("isisfish.populationSeasonInfo.months") }); + new String[] { t("isisfish.populationSeasonInfo.months") }); MatrixND result = MatrixFactory.getInstance().create( "test", new List[] { monthList2 }, - new String[] { _("isisfish.populationSeasonInfo.months") }); + new String[] { t("isisfish.populationSeasonInfo.months") }); tmp.pasteSemantics(result); } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2014-04-15 14:17:48 UTC (rev 3953) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2014-04-15 14:19:37 UTC (rev 3954) @@ -25,7 +25,7 @@ package fr.ifremer.isisfish.ui.sensitivity; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.HeadlessException; import javax.swing.JDialog; @@ -142,7 +142,7 @@ @Override public void run() { JOptionPane.showMessageDialog(dialog, tree, - _("Tree factor model"), + t("Tree factor model"), JOptionPane.INFORMATION_MESSAGE); } });