August 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2540 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator ui/simulator
by chatellier＠users.labs.libre-entreprise.org 27 Aug '09

27 Aug '09

Author: chatellier Date: 2009-08-27 08:36:37 +0000 (Thu, 27 Aug 2009) New Revision: 2540 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx Log: Fix cut&paste problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-08-26 17:35:35 UTC (rev 2539) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-08-27 08:36:37 UTC (rev 2540) @@ -181,7 +181,7 @@ protected String simulLogLevel = "info"; /** le niveau de log des scripts à utiliser pendant la simulation , par default info */ protected String scriptLogLevel = "info"; - /** le niveau de log des librairies à utiliser pendant la simulation , par default info */ + /** le niveau de log des librairies à utiliser pendant la simulation , par default error */ protected String libLogLevel = "error"; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2009-08-26 17:35:35 UTC (rev 2539) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2009-08-27 08:36:37 UTC (rev 2540) @@ -196,7 +196,7 @@ </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" - buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' + buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibInfoLevel()}' onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");valueChanged(true);'/> </cell> <cell fill="horizontal" weightx="0.2">

1 0

r2539 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 17:35:35 +0000 (Wed, 26 Aug 2009) New Revision: 2539 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java Log: Add author and version option on javadoc generation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-26 17:31:49 UTC (rev 2538) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-26 17:35:35 UTC (rev 2539) @@ -164,6 +164,10 @@ args.add("-link"); args.add(IsisFish.config.getJavadocURL()); + // also add author and version + args.add("-author"); + args.add("-version"); + for (File srcFile : filesSrc) { args.add(srcFile.getAbsolutePath()); }

1 0

r2538 - isis-fish/trunk/src/main/resources/templates/script
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 17:31:49 +0000 (Wed, 26 Aug 2009) New Revision: 2538 Modified: isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl isis-fish/trunk/src/main/resources/templates/script/export.ftl isis-fish/trunk/src/main/resources/templates/script/rule.ftl isis-fish/trunk/src/main/resources/templates/script/script.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl isis-fish/trunk/src/main/resources/templates/script/simulator.ftl Log: Ajout des headers de licences. Modified: isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/analyseplan.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package analyseplans; import static org.codelutin.i18n.I18n._; Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package exports; import org.apache.commons.logging.Log; Modified: isis-fish/trunk/src/main/resources/templates/script/rule.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/rule.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/trunk/src/main/resources/templates/script/script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package scripts; import org.apache.commons.logging.Log; Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package sensitivity; import static org.codelutin.i18n.I18n._; Modified: isis-fish/trunk/src/main/resources/templates/script/simulator.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-08-26 16:24:10 UTC (rev 2537) +++ isis-fish/trunk/src/main/resources/templates/script/simulator.ftl 2009-08-26 17:31:49 UTC (rev 2538) @@ -1,3 +1,21 @@ +/* + * Copyright (C) ${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 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. + */ + package simulators; import org.apache.commons.logging.Log;

1 0

r2536 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 15:34:26 +0000 (Wed, 26 Aug 2009) New Revision: 2536 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: New unzip implementation (more efficient with excluded paths) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-26 15:11:28 UTC (rev 2535) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-26 15:34:26 UTC (rev 2536) @@ -23,7 +23,6 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -31,12 +30,14 @@ import java.io.StringWriter; import java.io.Writer; import java.rmi.RemoteException; +import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.Semaphore; import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import org.apache.commons.io.FileUtils; @@ -46,7 +47,6 @@ import org.codelutin.util.FileUtil; import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; -import org.codelutin.util.ZipUtil; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -1051,51 +1051,56 @@ return remotePath; } - + /** * Unzip compressed archive and keep non exluded patterns. * * @param file archive file * @param targetDir destination file - * @param excludes excludes pattern + * @param excludes excludes pattern (pattern must match complete entry name including root folder) * @throws IOException * - * @Deprecated this code may be in lutin util later... + * @deprecated this code may be in lutin util later... */ protected void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { - ZipInputStream in = new ZipInputStream(new FileInputStream(file)); - ZipEntry entry; - while ((entry = in.getNextEntry()) != null) { + + ZipFile zipFile = new ZipFile(file); + + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); String name = entry.getName(); - // add continue to break loop + boolean excludeEntry = false; if (excludes != null) { - boolean excludeEntry = false; for (String exclude : excludes) { if (name.matches(exclude)) { excludeEntry = true; } } - if (excludeEntry) { - continue; - } } - File target = new File(targetDir, name); - if (entry.isDirectory()) { - target.mkdirs(); - } else { - target.getParentFile().mkdirs(); - OutputStream out = new BufferedOutputStream(new FileOutputStream(target)); - byte[] buffer = new byte[8 * 1024]; - int len; - while ((len = in.read(buffer, 0, 8 * 1024)) != -1) { - out.write(buffer, 0, len); + if (!excludeEntry) { + File target = new File(targetDir, name); + if (entry.isDirectory()) { + target.mkdirs(); + } else { + // get inputstream only here + InputStream in = zipFile.getInputStream(entry); + target.getParentFile().mkdirs(); + OutputStream out = new BufferedOutputStream(new FileOutputStream(target)); + byte[] buffer = new byte[8 * 1024]; + int len; + + while ((len = in.read(buffer, 0, 8 * 1024)) != -1) { + out.write(buffer, 0, len); + } + out.close(); + in.close(); } - out.close(); } } - in.close(); } } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-26 15:11:28 UTC (rev 2535) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-26 15:34:26 UTC (rev 2536) @@ -27,11 +27,8 @@ import org.apache.commons.logging.LogFactory; import org.junit.Test; -import com.sun.source.tree.AssertTree; - import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.simulator.SimulationHelperTest; import freemarker.template.TemplateException; /**

2 1

r2537 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 16:24:10 +0000 (Wed, 26 Aug 2009) New Revision: 2537 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Correction, du boucle TRES TRES lente (lecture non buffuris?\195?\169e) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-26 15:34:26 UTC (rev 2536) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-26 16:24:10 UTC (rev 2537) @@ -718,11 +718,7 @@ } if (!StringUtils.isEmpty(md5sum)) { - MD5InputStream in = new MD5InputStream(new FileInputStream(localFile)); - while(in.read() != -1) { - } - in.close(); - String localMd5 = MD5.asHex(in.hash()); + String localMd5 = MD5.asHex(MD5.getHash(localFile)); if (!localMd5.equals(md5sum)) { if (log.isWarnEnabled()) { log.warn("Warning md5 checksum failed (got " + localMd5 + ", expected : " + md5sum + ")");

1 0

r2535 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 15:11:28 +0000 (Wed, 26 Aug 2009) New Revision: 2535 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Encore les flottilles Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:08:51 UTC (rev 2534) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:11:28 UTC (rev 2535) @@ -127,7 +127,7 @@ isisfish.common.population=Population isisfish.common.populationGroup=Groupe de population isisfish.common.populations=Populations -isisfish.common.port=port +isisfish.common.port=Port isisfish.common.prev=Pr\u00E9c\u00E9dent isisfish.common.region=R\u00E9gion isisfish.common.remove=Supprimer @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des flottilles +isisfish.strategy.proportionSetOfVessels=Proportion de la flottille isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2534 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 15:08:51 +0000 (Wed, 26 Aug 2009) New Revision: 2534 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Flotille > Flottille Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:06:45 UTC (rev 2533) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:08:51 UTC (rev 2534) @@ -137,7 +137,7 @@ isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Flotille +isisfish.common.setOfVessels=Flottille isisfish.common.simulate=Simuler isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies @@ -494,7 +494,7 @@ isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueSetOfVessels=Continuer vers les flotilles +isisfish.input.continueSetOfVessels=Continuer vers les flottilles isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies isisfish.input.continueTripTypes=Continuer vers les types de trajets @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des flotilles +isisfish.strategy.proportionSetOfVessels=Proportion des flottilles isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2533 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 15:06:45 +0000 (Wed, 26 Aug 2009) New Revision: 2533 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix translations Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 14:51:07 UTC (rev 2532) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:06:45 UTC (rev 2533) @@ -137,7 +137,7 @@ isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Ensemble de navires +isisfish.common.setOfVessels=Flotille isisfish.common.simulate=Simuler isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies @@ -494,7 +494,7 @@ isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueSetOfVessels=Continuer vers les ensembles de navires +isisfish.input.continueSetOfVessels=Continuer vers les flotilles isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies isisfish.input.continueTripTypes=Continuer vers les types de trajets @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des ensembles de navires +isisfish.strategy.proportionSetOfVessels=Proportion des flotilles isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2532 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 14:51:07 +0000 (Wed, 26 Aug 2009) New Revision: 2532 Modified: isis-fish/trunk/src/main/resources/sensitivity.properties Log: Can be factorizable Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-08-26 12:25:46 UTC (rev 2531) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-08-26 14:51:07 UTC (rev 2532) @@ -15,11 +15,6 @@ Metier.Zone Population.Capturability Population.GeographicId -PopulationGroup.Age -PopulationGroup.MaxLength -PopulationGroup.MeanWeight -PopulationGroup.MinLength -PopulationGroup.Price PopulationGroup.ReproductionRate Population.Growth Population.GrowthReverse @@ -27,7 +22,6 @@ Population.MeanWeight Population.MonthGapBetweenReproRecrutement Population.NaturalDeathRate -Population.NaturalDeathRateMatrix Population.PlusGroup Population.Price Population.RecruitmentDistribution

1 0

r2531 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 26 Aug '09

26 Aug '09

Author: chatellier Date: 2009-08-26 12:25:46 +0000 (Wed, 26 Aug 2009) New Revision: 2531 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Ferme les flux ?\195?\160 la lecture/?\195?\169criture du fichier de sauvegarde des simulations en cours. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-08-26 12:24:48 UTC (rev 2530) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-08-26 12:25:46 UTC (rev 2531) @@ -24,6 +24,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.rmi.RemoteException; import java.util.Collection; import java.util.Comparator; @@ -153,10 +155,12 @@ public void reloadConfig(final SimulationService service) { if (monitorFile.canRead()) { + InputStream is = null; try { - properties.load(new FileInputStream(monitorFile)); + is = new FileInputStream(monitorFile); + properties.load(is); - // in a thead + // in a thread // don't temporize UI loading new Thread() { public void run() { @@ -168,6 +172,17 @@ log.error("Can't reload monitor file", e); } } + finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } + } } } @@ -284,7 +299,9 @@ monitorValue += MONITORFILESEPARATOR + planList; properties.put(monitorKey, monitorValue); + OutputStream out = null; try { + out = new FileOutputStream(monitorFile); properties.store(new FileOutputStream(monitorFile), "Simulation added at " + new Date()); } catch (IOException e) { @@ -292,6 +309,17 @@ log.error("Can't save monitor file", e); } } + finally { + if (out != null) { + try { + out.close(); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } + } if (log.isInfoEnabled()) { log.info("Saving simulation " + monitorKey + " as started"); @@ -322,18 +350,31 @@ String monitorKey = job.getId(); properties.remove(monitorKey); + OutputStream out = null; try { if (properties.isEmpty()) { monitorFile.delete(); } else { - properties.store(new FileOutputStream(monitorFile), - "Simulation delete at " + new Date()); + out = new FileOutputStream(monitorFile); + properties.store(out, "Simulation delete at " + new Date()); + } } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't save monitor file", e); } } + finally { + try { + if (out != null) { + out.close(); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } if (log.isInfoEnabled()) { log.info("Saving simulation " + monitorKey + " as stopped");

1 0