January 2013 - Isis-fish-commits - mailman.cloud.codelutin.com

r3816 - trunk
by echatellier＠users.forge.codelutin.com Jan. 28, 2013

Jan. 28, 2013

Author: echatellier Date: 2013-01-28 17:08:05 +0100 (Mon, 28 Jan 2013) New Revision: 3816 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3816 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-28 16:07:57 UTC (rev 3815) +++ trunk/pom.xml 2013-01-28 16:08:05 UTC (rev 3816) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.1.1</version> + <version>4.2.1.2-SNAPSHOT</version>  <dependencies> @@ -731,9 +731,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3815 - in tags: . isis-fish-4.2.1.1
by echatellier＠users.forge.codelutin.com Jan. 28, 2013

Jan. 28, 2013

Author: echatellier Date: 2013-01-28 17:07:57 +0100 (Mon, 28 Jan 2013) New Revision: 3815 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3815 Log: [maven-release-plugin] copy for tag isis-fish-4.2.1.1 Added: tags/isis-fish-4.2.1.1/ Property changes on: tags/isis-fish-4.2.1.1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0

r3814 - trunk
by echatellier＠users.forge.codelutin.com Jan. 28, 2013

Jan. 28, 2013

Author: echatellier Date: 2013-01-28 17:07:49 +0100 (Mon, 28 Jan 2013) New Revision: 3814 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3814 Log: [maven-release-plugin] prepare release isis-fish-4.2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-28 15:50:57 UTC (rev 3813) +++ trunk/pom.xml 2013-01-28 16:07:49 UTC (rev 3814) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.1.1-SNAPSHOT</version> + <version>4.2.1.1</version>  <dependencies> @@ -731,9 +731,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.1</url> </scm> <repositories>

1 0

r3813 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Jan. 28, 2013

Jan. 28, 2013

Author: echatellier Date: 2013-01-28 16:50:57 +0100 (Mon, 28 Jan 2013) New Revision: 3813 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3813 Log: And happy new year 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 2013-01-28 15:49:46 UTC (rev 3812) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2013-01-28 15:50:57 UTC (rev 3813) @@ -64,7 +64,7 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2012. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2013. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-01-28 15:49:46 UTC (rev 3812) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-01-28 15:50:57 UTC (rev 3813) @@ -63,7 +63,7 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2012. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2013. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés

1 0

r3812 - trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com Jan. 28, 2013

Jan. 28, 2013

Author: echatellier Date: 2013-01-28 16:49:46 +0100 (Mon, 28 Jan 2013) New Revision: 3812 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3812 Log: fixes #1937: deep clone factor groups Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-01-24 14:35:49 UTC (rev 3811) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-01-28 15:49:46 UTC (rev 3812) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2013 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 @@ -307,4 +307,21 @@ public Object getDisplayedValue() { return identifier; } + + /** + * {@inheritDoc} + */ + @Override + public Object clone() { + + FactorGroup f = (FactorGroup)super.clone(); + + // deep copy of subfactors + f.factors = new ArrayList<Factor>(factors.size()); + for (Factor subFactor : factors) { + f.factors.add((Factor)subFactor.clone()); + } + + return f; + } }

1 0

r3811 - trunk/src/main/resources/i18n
by jcouteau＠users.forge.codelutin.com Jan. 24, 2013

Jan. 24, 2013

Author: jcouteau Date: 2013-01-24 15:35:49 +0100 (Thu, 24 Jan 2013) New Revision: 3811 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3811 Log: Fix typo 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 2013-01-14 09:14:33 UTC (rev 3810) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-01-24 14:35:49 UTC (rev 3811) @@ -1,4 +1,3 @@ -= 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 @@ -126,7 +125,7 @@ isisfish.common.saveModel=Sauver comme modèle isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Flottille +isisfish.common.setOfVessels=Flotille isisfish.common.simulate=Simuler isisfish.common.strategies=Stratégies isisfish.common.sum=somme

1 0

r3810 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com Jan. 14, 2013

Jan. 14, 2013

Author: echatellier Date: 2013-01-14 10:14:33 +0100 (Mon, 14 Jan 2013) New Revision: 3810 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3810 Log: fixes #1916: init nimbus only if ui is activated Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-12-19 14:00:54 UTC (rev 3809) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-01-14 09:14:33 UTC (rev 3810) @@ -191,13 +191,16 @@ * @throws UnsupportedLookAndFeelException */ private static void initLookAndFeel() throws InstantiationException, IllegalAccessException, UnsupportedLookAndFeelException { - for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) { - if ("Nimbus".equals(laf.getName())) { - try { - UIManager.setLookAndFeel(laf.getClassName()); - } catch (ClassNotFoundException e) { - // could not fin nimbus look-and-feel - log.warn("Can't install nimbus"); + // must be done only if ui is activated (bug on java 7) + if (config.isLaunchUI()) { + for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) { + if ("Nimbus".equals(laf.getName())) { + try { + UIManager.setLookAndFeel(laf.getClassName()); + } catch (ClassNotFoundException e) { + // could not fin nimbus look-and-feel + log.warn("Can't install nimbus"); + } } } }

1 0