Author: echatellier Date: 2013-11-02 10:51:05 +0100 (Sat, 02 Nov 2013) New Revision: 3827 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3827 Log: Fix some reported problems Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.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 Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/pom.xml 2013-11-02 09:51:05 UTC (rev 3827) @@ -295,17 +295,17 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.7.3</version> + <version>1.7.4</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.7.3</version> + <version>1.7.4</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> - <version>1.7.3</version> + <version>1.7.4</version> </dependency> <!-- ssj pour les calculs stockastiques --> @@ -321,7 +321,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>1.7.8</version> <scope>compile</scope> </dependency> <!-- fin svnkit pour communication subversion --> @@ -476,7 +476,7 @@ <signatureVersion>1.0</signatureVersion> <!-- Dependencies version --> - <jaxxVersion>2.5.28</jaxxVersion> + <jaxxVersion>2.5.29</jaxxVersion> <eugeneVersion>2.6.3</eugeneVersion> <topiaVersion>2.8.1.3</topiaVersion> <hibernateVersion>4.2.7.Final</hibernateVersion> @@ -679,10 +679,6 @@ <id>nuiton.public</id> <url>http://nexus.nuiton.org/nexus/content/groups/public</url> </repository> - <repository> - <id>svnkit.public</id> - <url>http://maven.tmatesoft.com/content/repositories/snapshots</url> - </repository> </repositories> <pluginRepositories> @@ -741,7 +737,7 @@ <properties> <!-- pmd config --> <minimumTokens>100</minimumTokens> - <targetJdk>1.6</targetJdk> + <targetJdk>1.7</targetJdk> </properties> <build> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2013-11-02 09:51:05 UTC (rev 3827) @@ -31,7 +31,6 @@ import java.util.List; import org.apache.commons.io.FileUtils; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2013-11-02 09:51:05 UTC (rev 3827) @@ -559,8 +559,6 @@ // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { - log.debug("Capturability has changed, create new matrix and copy old: " - + mat.getSemantics() + " " + sems); MatrixND newmat = MatrixFactory.getInstance().create( n_("isisfish.population.capturability"), sems, Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2013-11-02 09:51:05 UTC (rev 3827) @@ -62,7 +62,7 @@ public List<Month> getMonths() { List<Month> result = new ArrayList<Month>(); Month m = getFirstMonth(); - while (m.equals(getLastMonth()) == false) { + while (!m.equals(getLastMonth())) { result.add(m); m = m.next(); } @@ -92,7 +92,7 @@ boolean result = month.equals(getLastMonth()); // check first last month, because loop don't do that Month m = getFirstMonth(); - while (result == false && m.equals(getLastMonth()) == false) { + while (!result && !m.equals(getLastMonth())) { result = m.equals(month); m = m.next(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2013-11-02 09:51:05 UTC (rev 3827) @@ -425,7 +425,7 @@ waitAndCheckProgression(); } catch (Exception e) { if (log.isErrorEnabled()) { - log.error("An exception occurs durring monitoring", e); + log.error("An exception occurs during monitoring", e); } } } 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 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2013-11-02 09:51:05 UTC (rev 3827) @@ -1,4 +1,6 @@ = +%s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.= +%s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s @@ -39,12 +41,14 @@ Maximum\ value= Minimum\ value= Missing\ name= +Modifier\ le\ code\ R\ envoyé\ si\ vous\ le\ souhaitez= No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= +R\ modif= Reference\ value= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited= 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 2013-11-02 09:31:48 UTC (rev 3826) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-02 09:51:05 UTC (rev 3827) @@ -1,4 +1,6 @@ = +%s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.= +%s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s @@ -39,12 +41,14 @@ Maximum\ value= Minimum\ value= Missing\ name= +Modifier\ le\ code\ R\ envoyé\ si\ vous\ le\ souhaitez= No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= +R\ modif= Reference\ value= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited=La région %s a déjà été initialisée