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

r4357 - branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com July 27, 2016

July 27, 2016

Author: echatellier Date: 2016-07-27 09:54:13 +0200 (Wed, 27 Jul 2016) New Revision: 4357 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4357 Log: Fix NPE Modified: branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java Modified: branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java =================================================================== --- branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2016-07-27 07:45:40 UTC (rev 4356) +++ branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2016-07-27 07:54:13 UTC (rev 4357) @@ -101,7 +101,7 @@ SimulationParameter childParam = param.copy(); childParam.setSimulationPlanNumber(number); childParam.setOptimizationGeneration(generations.size()); - childParam.setOptimizationGenerationIndividual(nextSimulations.size()); + childParam.setOptimizationGenerationIndividual(getNextSimulations().size()); SimulationStorage result = SimulationStorage.importAndRenameZip(job.getItem().getSimulationZip(), simId); result.setParameter(childParam);

1 0

r4356 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com July 27, 2016

July 27, 2016

Author: echatellier Date: 2016-07-27 09:45:40 +0200 (Wed, 27 Jul 2016) New Revision: 4356 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4356 Log: Fix NPE Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2016-07-27 07:24:50 UTC (rev 4355) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2016-07-27 07:45:40 UTC (rev 4356) @@ -101,7 +101,7 @@ SimulationParameter childParam = param.copy(); childParam.setSimulationPlanNumber(number); childParam.setOptimizationGeneration(generations.size()); - childParam.setOptimizationGenerationIndividual(nextSimulations.size()); + childParam.setOptimizationGenerationIndividual(getNextSimulations().size()); SimulationStorage result = SimulationStorage.importAndRenameZip(job.getItem().getSimulationZip(), simId); result.setParameter(childParam);

1 0

r4355 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com July 27, 2016

July 27, 2016

Author: echatellier Date: 2016-07-27 09:24:50 +0200 (Wed, 27 Jul 2016) New Revision: 4355 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4355 Log: FIx i18n Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-07-27 07:24:34 UTC (rev 4354) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2016-07-27 07:24:50 UTC (rev 4355) @@ -17,7 +17,7 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Coefficient= +Coefficient=Coefficient Command\ '%s'\ fail\ to\ execute= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= Dbimom= @@ -702,14 +702,14 @@ isisfish.populationMigration.selectSeason=Sélectionnez une saison isisfish.populationMigration.title=Migration isisfish.populationMigration.useEquation=Utiliser l'équation -isisfish.populationMigrationEmigration.coefficient= +isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Zone de départ isisfish.populationMigrationEmigration.title=Emmigration isisfish.populationMigrationImmigration.arrivalZone=Zone d'arrivée -isisfish.populationMigrationImmigration.coefficient= +isisfish.populationMigrationImmigration.coefficient=Coefficient isisfish.populationMigrationImmigration.title=Immigration isisfish.populationMigrationMigration.arrivalZone=Zone d'arrivée -isisfish.populationMigrationMigration.coefficient= +isisfish.populationMigrationMigration.coefficient=Coefficient isisfish.populationMigrationMigration.departureZone=Zone de départ isisfish.populationMigrationMigration.title=Migration de population isisfish.populationPrice.title=Prix

1 0

r4354 - trunk
by echatellier＠users.forge.codelutin.com July 27, 2016

July 27, 2016

Author: echatellier Date: 2016-07-27 09:24:34 +0200 (Wed, 27 Jul 2016) New Revision: 4354 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4354 Log: Udpate libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-07-26 14:09:39 UTC (rev 4353) +++ trunk/pom.xml 2016-07-27 07:24:34 UTC (rev 4354) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-11</version> + <version>3.0-rc-12</version> <scope>compile</scope> </dependency> @@ -242,7 +242,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.6.1</version> + <version>2.6.2</version> <scope>compile</scope> </dependency> @@ -249,7 +249,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.6.1</version> + <version>2.6.2</version> <scope>compile</scope> </dependency> @@ -256,7 +256,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.6.1</version> + <version>2.6.2</version> <scope>runtime</scope> </dependency> @@ -263,7 +263,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.6.1</version> + <version>2.6.2</version> <scope>runtime</scope> </dependency> @@ -377,7 +377,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.23</version> + <version>2.3.25-incubating</version> <scope>compile</scope> </dependency>

1 0

r4353 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com July 26, 2016

July 26, 2016

Author: echatellier Date: 2016-07-26 16:09:39 +0200 (Tue, 26 Jul 2016) New Revision: 4353 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4353 Log: Fix compilation Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-06-29 14:05:19 UTC (rev 4352) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-07-26 14:09:39 UTC (rev 4353) @@ -25,6 +25,8 @@ package fr.ifremer.isisfish.simulator; +import static org.nuiton.i18n.I18n.t; + import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.entities.Observation;

1 0