Author: echatellier Date: 2013-03-11 14:14:28 +0100 (Mon, 11 Mar 2013) New Revision: 3817 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3817 Log: Merge trunk into branch Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 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/sensitivity/FactorGroup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.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/main/resources/templates/script/export.ftl branches/4.0.1/src/main/resources/templates/script/rule.ftl branches/4.0.1/src/main/resources/templates/script/script.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl branches/4.0.1/src/main/resources/templates/script/simulator.ftl Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/pom.xml 2013-03-11 13:14:28 UTC (rev 3817) @@ -6,12 +6,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.8</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.2.0-SNAPSHOT</version> + <version>4.3.0.0-SNAPSHOT</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -115,7 +115,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 2, 0); + protected final static Version version = new Version(4, 3, 0, 0); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -190,13 +190,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"); + } } } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -112,6 +112,16 @@ setParameter(parameter); } + @Override + public void closeStorage() throws TopiaException { + // force result storage close + if (resultStorage != null) { + resultStorage.close(); + resultStorage = null; + } + super.closeStorage(); + } + /** * Retourne le repertoire de base de stockage des simulations. * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -249,6 +250,14 @@ if (!subControl.isStopSimulationRequest()) { SimulationStorage simulation = subjob.getLauncher().getSimulationStorage(simulationService, subControl); i.finished(subjob, simulation); + try { + simulation.closeStorage(); + simulation.closeMemStorage(); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close simulation", ex); + } + } } } 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-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -53,6 +53,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationInformation; @@ -626,6 +627,15 @@ analyzeSensitivityResult(job, simulation); } } + + try { + simulation.closeStorage(); + simulation.closeMemStorage(); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close simulation", ex); + } + } } else { // allow simulation to restart to be properly removed Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 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 @@ -309,4 +309,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; + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -87,8 +87,8 @@ static { URLSALIAS.put("ISISFISH", "http://www.isis-fish.org/"); - URLSALIAS.put("JAVA_API", "http://java.sun.com/javase/6/docs/api/index.html"); - URLSALIAS.put("ISIS_API", "http://www.isis-fish.org/isis-fish/apidocs/index.html"); + URLSALIAS.put("JAVA_API", "http://docs.oracle.com/javase/6/docs/api/index.html"); + URLSALIAS.put("ISIS_API", "http://www.isis-fish.org/apidocs/index.html"); URLSALIAS.put("MATRIX_API", "http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html"); URLSALIAS.put("TOPIA_API", "http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html"); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2013-03-11 13:14:28 UTC (rev 3817) @@ -183,7 +183,7 @@ args.add(dest.getAbsolutePath()); args.add("-link"); - args.add("http://java.sun.com/javase/6/docs/api/"); + args.add("http://docs.oracle.com/javase/6/docs/api/"); args.add("-link"); args.add(IsisFish.config.getJavadocURL()); 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-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2013-03-11 13:14:28 UTC (rev 3817) @@ -82,7 +82,7 @@ dhyper= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2012.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2013.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />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: 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-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-03-11 13:14:28 UTC (rev 3817) @@ -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 @@ -82,7 +81,7 @@ dhyper= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2012.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html><b>ISIS-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2013.<br /><br /><a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a><br /><br />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 @@ -144,7 +143,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 Modified: branches/4.0.1/src/main/resources/templates/script/export.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/export.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/export.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package exports; Modified: branches/4.0.1/src/main/resources/templates/script/rule.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/rule.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/rule.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package rules; Modified: branches/4.0.1/src/main/resources/templates/script/script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/script.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/script.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package scripts; Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package sensitivityanalysis; Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package sensitivityexports; Modified: branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package simulationplans; Modified: branches/4.0.1/src/main/resources/templates/script/simulator.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2013-01-28 16:08:05 UTC (rev 3816) +++ branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2013-03-11 13:14:28 UTC (rev 3817) @@ -25,19 +25,19 @@ /* * Copyright (C) ${date?date?string("yyyy")} ${author} * - * 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 2 - * of the License, or (at your option) any later version. - * + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * 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>. */ package simulators;