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

r3821 - branches/4.0.1
by echatellier＠users.forge.codelutin.com March 11, 2013

March 11, 2013

Author: echatellier Date: 2013-03-11 18:04:52 +0100 (Mon, 11 Mar 2013) New Revision: 3821 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3821 Log: fixes #1787 : Update to ssj 2.5 Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-03-11 16:48:16 UTC (rev 3820) +++ branches/4.0.1/pom.xml 2013-03-11 17:04:52 UTC (rev 3821) @@ -324,51 +324,9 @@ <dependency> <groupId>ssj</groupId> <artifactId>ssj</artifactId> - <version>2.1.1</version> + <version>2.5</version> <scope>runtime</scope> </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>Blas</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>colt</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>interpreter</artifactId> - <version>1.6.8</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>language</artifactId> - <version>1.6.7</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>logger</artifactId> - <version>1.6.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>optimization</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency>

1 0

March 11, 2013

Author: echatellier Date: 2013-03-11 17:48:16 +0100 (Mon, 11 Mar 2013) New Revision: 3820 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3820 Log: Fix warning and deprecated stuff 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/aspect/TraceAspect.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/pom.xml 2013-03-11 16:48:16 UTC (rev 3820) @@ -23,6 +23,13 @@ <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -107,16 +114,17 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>swingx-core</artifactId> - <groupId>org.swinglabs</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -127,12 +135,6 @@ <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>swingx-core</artifactId> - <groupId>org.swinglabs</groupId> - </exclusion> - </exclusions> </dependency> <dependency> 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-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -43,7 +43,8 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.nuiton.math.matrix.DoubleBigVector; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.util.config.ConfigOptionDef; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -946,7 +947,7 @@ * * Set it protected to force getOption() call. */ - public static enum Option implements OptionDef { + public static enum Option implements ConfigOptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), ISIS_HOME_DIRECTORY("isis.home.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()), Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -26,11 +26,7 @@ package fr.ifremer.isisfish.aspect; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.aspectwerkz.annotation.After; import org.codehaus.aspectwerkz.annotation.AfterThrowing; import org.codehaus.aspectwerkz.annotation.Aspect; @@ -40,7 +36,6 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Trace; @@ -61,9 +56,6 @@ @Aspect("perJVM") public class TraceAspect { - /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(TraceAspect.class); - @Expression("execution(* scripts..*(..))" + " || execution(* simulators..*(..))" + " || execution(* rules..*(..)) " 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-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -232,7 +232,7 @@ public void setContent(String content, boolean saveToFile) throws IOException { this.content = content; if (saveToFile) { - FileUtil.writeString(getFile(), content, "utf-8"); + FileUtils.writeStringToFile(getFile(), content, "utf-8"); lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -36,7 +36,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; import org.nuiton.util.Version; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -46,9 +46,8 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.dom4j.Document; @@ -61,7 +60,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper; import org.xml.sax.InputSource; import fr.ifremer.isisfish.IsisFishDAOHelper; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -27,8 +27,6 @@ import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -52,9 +50,6 @@ */ public class RuleHelper extends StorageHelper { - /** Logger for this class. */ - private static final Log log = LogFactory.getLog(RuleHelper.class); - /** * Recupere dans propriétés les valeurs des champs spécifiques à la règle et * met à jour les champs de la règle. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -1249,7 +1249,7 @@ // Sauvegarde du design plan en XML if (!StringUtils.isEmpty(xmlDesignPlan)) { File simulationDesignPlanFile = SimulationStorage.getMexicoDesignPlan(tmpDirectory); - FileUtil.writeString(simulationDesignPlanFile, xmlDesignPlan, "utf-8"); + FileUtils.writeStringToFile(simulationDesignPlanFile, xmlDesignPlan, "utf-8"); } // creation du zip 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-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -41,8 +41,8 @@ import javax.swing.ToolTipManager; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.editor.config.ConfigUI; -import jaxx.runtime.swing.editor.config.ConfigUIHelper; +import jaxx.runtime.swing.config.ConfigUI; +import jaxx.runtime.swing.config.ConfigUIHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -29,7 +29,6 @@ <import> fr.ifremer.isisfish.entities.Gear; - jaxx.runtime.swing.editor.NumberEditor; java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; </import> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -46,7 +46,6 @@ java.util.ArrayList java.util.List java.awt.Dimension - javax.swing.DefaultComboBoxModel </import> <BeanValidator id='validator' context="metier" Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -33,7 +33,6 @@ fr.ifremer.isisfish.entities.SetOfVessels fr.ifremer.isisfish.ui.input.model.PortComboModel fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel - jaxx.runtime.swing.editor.NumberEditor java.beans.PropertyChangeEvent java.beans.PropertyChangeListener </import> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -30,7 +30,6 @@ <import> static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.entities.Species; - jaxx.runtime.swing.editor.NumberEditor; java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; </import> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -34,7 +34,6 @@ <import> fr.ifremer.isisfish.entities.Strategy fr.ifremer.isisfish.entities.StrategyMonthInfo - jaxx.runtime.swing.editor.NumberEditor fr.ifremer.isisfish.entities.TripType java.beans.PropertyChangeEvent java.beans.PropertyChangeListener Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -33,7 +33,6 @@ fr.ifremer.isisfish.entities.TripType fr.ifremer.isisfish.types.TimeUnit fr.ifremer.isisfish.ui.input.model.TripTypeListModel - jaxx.runtime.swing.editor.NumberEditor java.beans.PropertyChangeEvent java.beans.PropertyChangeListener </import> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -28,7 +28,6 @@ <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> <import> - static org.nuiton.i18n.I18n.n_ javax.swing.event.ListSelectionEvent fr.ifremer.isisfish.entities.Cell fr.ifremer.isisfish.entities.Zone Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -28,8 +28,6 @@ <import> static org.nuiton.i18n.I18n.n_ - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; </import> <script><![CDATA[ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -54,7 +54,7 @@ public StringBuffer getInfo() { StringBuffer result = new StringBuffer(); - for (Iterator i = order.iterator(); i.hasNext();) { + for (Iterator<Object> i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getInfo(o); if (tmp.length() != 0) { @@ -73,7 +73,7 @@ public StringBuffer getWarning() { StringBuffer result = new StringBuffer(); - for (Iterator i = order.iterator(); i.hasNext();) { + for (Iterator<Object> i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getWarning(o); if (tmp.length() != 0) { @@ -92,7 +92,7 @@ public StringBuffer getError() { StringBuffer result = new StringBuffer(); - for (Iterator i = order.iterator(); i.hasNext();) { + for (Iterator<Object> i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getError(o); if (tmp.length() != 0) { @@ -111,11 +111,11 @@ public StringBuffer getInfo(Object o) { StringBuffer result = new StringBuffer(); - List list = info.get(o); + List<String> list = info.get(o); if (list != null && list.size() != 0) { result.append("Info\n"); result.append("----\n"); - for (Iterator i = list.iterator(); i.hasNext();) { + for (Iterator<String> i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } @@ -125,11 +125,11 @@ public StringBuffer getWarning(Object o) { StringBuffer result = new StringBuffer(); - List list = warning.get(o); + List<String> list = warning.get(o); if (list != null && list.size() != 0) { result.append("Problème\n"); result.append("--------\n"); - for (Iterator i = list.iterator(); i.hasNext();) { + for (Iterator<String> i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } @@ -139,11 +139,11 @@ public StringBuffer getError(Object o) { StringBuffer result = new StringBuffer(); - List list = error.get(o); + List<String> list = error.get(o); if (list != null && list.size() != 0) { result.append("Erreur\n"); result.append("------\n"); - for (Iterator i = list.iterator(); i.hasNext();) { + for (Iterator<String> i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } @@ -171,7 +171,7 @@ public StringBuffer getAll() { StringBuffer result = new StringBuffer(); - for (Iterator i = order.iterator(); i.hasNext();) { + for (Iterator<Object> i = order.iterator(); i.hasNext();) { result.append(getAll(i.next())); } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -54,13 +54,13 @@ * par : $Author$ */ public class CheckResultTableModel extends AbstractTableModel implements - Comparator { // CheckResultTableModel + Comparator<Object[]> { // CheckResultTableModel /** serialVersionUID. */ private static final long serialVersionUID = 328398134761266970L; protected CheckResult checkResult; - protected ArrayList data; + protected List<Object[]> data; protected int sortedBy = -1; protected boolean ascending = true; @@ -74,23 +74,23 @@ } protected void computeData() { - data = new ArrayList(); - for (Iterator i = checkResult.order.iterator(); i.hasNext();) { + data = new ArrayList<>(); + for (Iterator<Object> i = checkResult.order.iterator(); i.hasNext();) { TopiaEntity o = (TopiaEntity) i.next(); String type = TopiaId.getClassNameAsString(o.getTopiaId()); - addOneData(o, type, "error", (List) checkResult.error.get(o), data); - addOneData(o, type, "warning", (List) checkResult.warning.get(o), + addOneData(o, type, "error", checkResult.error.get(o), data); + addOneData(o, type, "warning", checkResult.warning.get(o), data); - addOneData(o, type, "info", (List) checkResult.info.get(o), data); + addOneData(o, type, "info", checkResult.info.get(o), data); } fireTableDataChanged(); } - protected void addOneData(Object o, String type, String level, List list, - Collection result) { + protected void addOneData(Object o, String type, String level, List<String> list, + Collection<Object[]> result) { if (list != null && list.size() != 0) { - for (Iterator m = list.iterator(); m.hasNext();) { + for (Iterator<String> m = list.iterator(); m.hasNext();) { Object message = m.next(); result.add(new Object[] { type, o, level, message }); } @@ -127,10 +127,7 @@ fireTableDataChanged(); } - public int compare(Object o1, Object o2) { - Object[] data1 = (Object[]) o1; - Object[] data2 = (Object[]) o2; - + public int compare(Object[] data1, Object[] data2) { int result = data1[sortedBy].toString().compareTo( data2[sortedBy].toString()); return ascending ? result : -result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class FormuleComboModel extends DefaultComboBoxModel { +public class FormuleComboModel extends DefaultComboBoxModel<Formule> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Formule getElementAt(int index) { return formules.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class EffortDescriptionListModel extends DefaultListModel { +public class EffortDescriptionListModel extends DefaultListModel<EffortDescription> { /** serialVersionUID. */ private static final long serialVersionUID = -2715181950778932871L; @@ -87,7 +87,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public EffortDescription getElementAt(int index) { return effortDescriptions.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class GearComboModel extends DefaultComboBoxModel { +public class GearComboModel extends DefaultComboBoxModel<Gear> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Gear getElementAt(int index) { return gearList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MetierListModel extends DefaultListModel { +public class MetierListModel extends DefaultListModel<Metier> { /** serialVersionUID. */ private static final long serialVersionUID = -2715181950778932871L; @@ -87,7 +87,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Metier getElementAt(int index) { return metiers.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class MetierSeasonInfoComboModel extends DefaultComboBoxModel { +public class MetierSeasonInfoComboModel extends DefaultComboBoxModel<MetierSeasonInfo> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public MetierSeasonInfo getElementAt(int index) { return metierSeasonInfo.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class PopulationComboModel extends DefaultComboBoxModel { +public class PopulationComboModel extends DefaultComboBoxModel<Population> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Population getElementAt(int index) { return populations.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ * By : $Author: chatellier $ */ -public class PopulationSeasonInfoComboModel extends DefaultComboBoxModel { +public class PopulationSeasonInfoComboModel extends DefaultComboBoxModel<PopulationSeasonInfo> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -89,7 +89,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public PopulationSeasonInfo getElementAt(int index) { return populationSeasonInfos.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class PortComboModel extends DefaultComboBoxModel { +public class PortComboModel extends DefaultComboBoxModel<Port> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Port getElementAt(int index) { return portsList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SetOfVesselsComboModel extends DefaultComboBoxModel { +public class SetOfVesselsComboModel extends DefaultComboBoxModel<SetOfVessels> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public SetOfVessels getElementAt(int index) { return setOfVesselsList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class SpeciesComboModel extends DefaultComboBoxModel { +public class SpeciesComboModel extends DefaultComboBoxModel<Species> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Species getElementAt(int index) { return speciesList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class TopiaEntityListModel extends DefaultListModel { +public class TopiaEntityListModel extends DefaultListModel<TopiaEntity> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -78,7 +78,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public TopiaEntity getElementAt(int index) { return entities.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class TripTypeComboModel extends DefaultComboBoxModel { +public class TripTypeComboModel extends DefaultComboBoxModel<TripType> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public TripType getElementAt(int index) { return tripTypes.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class TripTypeListModel extends DefaultListModel { +public class TripTypeListModel extends DefaultListModel<TripType> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public TripType getElementAt(int index) { return tripTypes.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class VesselTypeComboModel extends DefaultComboBoxModel { +public class VesselTypeComboModel extends DefaultComboBoxModel<VesselType> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public VesselType getElementAt(int index) { return vesselTypeList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class ZoneListModel extends DefaultListModel { +public class ZoneListModel extends DefaultListModel<Zone> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -63,7 +63,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Zone getElementAt(int index) { return zones.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -62,7 +62,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alternated highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -51,7 +51,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alternated highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -25,9 +25,6 @@ package fr.ifremer.isisfish.ui.input.variable; -import java.util.ArrayList; -import java.util.List; - import javax.swing.DefaultComboBoxModel; import fr.ifremer.isisfish.entities.VariableType; @@ -41,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class VariableTypeComboModel extends DefaultComboBoxModel { +public class VariableTypeComboModel extends DefaultComboBoxModel<VariableType> { /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; @@ -60,7 +57,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public VariableType getElementAt(int index) { return variableTypes[index]; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class StringComboModel extends DefaultComboBoxModel { +public class StringComboModel extends DefaultComboBoxModel<String> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -97,7 +97,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public String getElementAt(int index) { return stringList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class StringListModel extends AbstractListModel { +public class StringListModel extends AbstractListModel<String> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -86,7 +86,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public String getElementAt(int index) { return stringList.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class ExportListModel extends AbstractListModel { +public class ExportListModel extends AbstractListModel<Export> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -86,7 +86,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Export getElementAt(int index) { return exports.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -52,7 +52,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -38,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class RuleComboModel extends DefaultComboBoxModel { +public class RuleComboModel extends DefaultComboBoxModel<String> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -90,7 +90,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public String getElementAt(int index) { return rulesNames.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -52,7 +52,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class RuleListModel extends AbstractListModel { +public class RuleListModel extends AbstractListModel<Rule> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -86,7 +86,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Rule getElementAt(int index) { return rules.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -38,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SensitivityAnalysisComboModel extends DefaultComboBoxModel { +public class SensitivityAnalysisComboModel extends DefaultComboBoxModel<String> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -90,7 +90,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public String getElementAt(int index) { return sensitivityAnalysisNames.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SensitivityAnalysisListModel extends AbstractListModel { +public class SensitivityAnalysisListModel extends AbstractListModel<SensitivityAnalysis> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -85,7 +85,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public SensitivityAnalysis getElementAt(int index) { return sensitivityAnalysis.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -52,7 +52,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class SensitivityExportListModel extends AbstractListModel { +public class SensitivityExportListModel extends AbstractListModel<SensitivityExport> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -86,7 +86,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public SensitivityExport getElementAt(int index) { return exports.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -52,7 +52,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -38,7 +38,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SimulationPlanComboModel extends DefaultComboBoxModel { +public class SimulationPlanComboModel extends DefaultComboBoxModel<String> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -89,7 +89,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public String getElementAt(int index) { return simulationPlanNames.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -67,7 +67,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -40,7 +40,7 @@ * Last update : $Date$ * By : $Author$ */ -public class SimulationPlanListModel extends AbstractListModel { +public class SimulationPlanListModel extends AbstractListModel<SimulationPlan> { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -85,7 +85,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public SimulationPlan getElementAt(int index) { return plans.get(index); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -52,7 +52,7 @@ * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { // this must be used to have alterned highlight rows and default Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -23,9 +23,6 @@ #L% --> <Table> - <import> - static org.nuiton.i18n.I18n._ - </import> <row> <cell fill="horizontal"> <com.bbn.openmap.gui.ToolPanel id="toolPanel" /> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -43,8 +43,6 @@ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisComboModel fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisComboRenderer - fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisListModel - fr.ifremer.isisfish.ui.models.sensitivityanalysis.SensitivityAnalysisListRenderer fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellEditor fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -30,59 +30,37 @@ import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; -import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTextField; import javax.swing.event.TreeSelectionEvent; import javax.swing.text.JTextComponent; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import jaxx.runtime.context.JAXXInitialContext; - import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.gui.MatrixPanelEditor; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.mexico.MexicoHelper; -import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.SimulationUI; -import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputContentUI; import fr.ifremer.isisfish.ui.input.InputHandler; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; @@ -90,13 +68,10 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeHelper; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; -import fr.ifremer.isisfish.ui.sensitivity.wizard.EquationContinuousPanelUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; import fr.ifremer.isisfish.ui.simulator.RuleChooser; import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.widget.editor.MonthComponent; -import fr.ifremer.isisfish.ui.widget.editor.StepComponent; /** * Handler for sensitivity tab ui (fishery region factors). Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -27,7 +27,6 @@ java.util.ArrayList java.io.File java.io.IOException - javax.swing.ComboBoxModel org.apache.commons.io.FileUtils fr.ifremer.isisfish.datastore.SimulationStorage fr.ifremer.isisfish.simulator.launcher.SimulationService Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -24,13 +24,8 @@ --> <fr.ifremer.isisfish.ui.NavigationUI> <import> - javax.swing.JPopupMenu javax.swing.tree.DefaultTreeModel - javax.swing.tree.TreePath - javax.swing.tree.DefaultMutableTreeNode - javax.swing.tree.TreeNode fr.ifremer.isisfish.datastore.RegionStorage - fr.ifremer.isisfish.simulator.sensitivity.Factor fr.ifremer.isisfish.ui.WelcomePanelUI fr.ifremer.isisfish.ui.input.InputAction fr.ifremer.isisfish.ui.input.InputSaveVerifier @@ -39,9 +34,7 @@ fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer fr.ifremer.isisfish.ui.sensitivity.model.FactorTree - javax.swing.JComponent java.awt.event.ActionListener - javax.swing.JMenuItem java.awt.event.ActionEvent </import> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -42,7 +42,6 @@ fr.ifremer.isisfish.rule.Rule fr.ifremer.isisfish.ui.models.rule.RuleListModel fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel - fr.ifremer.isisfish.ui.SimulationUI </import> <script><![CDATA[ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -66,7 +66,6 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SensitivityAnalysisStorage; import fr.ifremer.isisfish.datastore.SensitivityExportStorage; @@ -86,12 +85,10 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.Distribution; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; -import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -25,12 +25,8 @@ <JDialog> <import> javax.swing.text.html.HTMLEditorKit; - javax.swing.text.html.HTMLDocument; javax.swing.event.HyperlinkListener; - javax.swing.text.html.HTMLFrameHyperlinkEvent; javax.swing.event.HyperlinkEvent; - java.io.PrintWriter; - java.io.StringWriter; java.net.URL; javax.swing.JComponent java.awt.Color Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -26,9 +26,7 @@ <import> com.jcraft.jsch.JSch; com.jcraft.jsch.KeyPair; - org.nuiton.util.FileUtil; java.io.File; - java.io.IOException; java.util.ArrayList; java.util.Arrays; java.util.HashMap; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -57,14 +57,14 @@ * Last update : $Date$ * By : $Author$ */ -public class FilterableComboBox extends JPanel implements ListDataListener { +public class FilterableComboBox<T> extends JPanel implements ListDataListener { private static Log log = LogFactory.getLog(FilterableComboBox.class); /** serialVersionUID. */ private static final long serialVersionUID = -6669320998140538372L; - protected JComboBox dataBox; + protected JComboBox<T> dataBox; protected JTextField filterField; protected JButton resetButton; @@ -79,28 +79,28 @@ buildLayout(); } - public FilterableComboBox(ComboBoxModel model) { + public FilterableComboBox(ComboBoxModel<T> model) { this(); setModel(model); } - class FilterComboBoxModel extends AbstractListModel implements ComboBoxModel { + class FilterComboBoxModel extends AbstractListModel<T> implements ComboBoxModel<T> { /** serialVersionUID. */ private static final long serialVersionUID = 6256289874593024153L; - protected ComboBoxModel model; + protected ComboBoxModel<T> model; protected List<Integer> realIndexes = new ArrayList<Integer>(); protected Object selectedItem; - public FilterComboBoxModel(ComboBoxModel model) { + public FilterComboBoxModel(ComboBoxModel<T> model) { this.model = model; fireDataChanged(); } - public ComboBoxModel getModel() { + public ComboBoxModel<T> getModel() { return model; } @@ -111,9 +111,9 @@ } @Override - public Object getElementAt(int index) { + public T getElementAt(int index) { int realIndex = realIndexes.get(index); - Object element = model.getElementAt(realIndex); + T element = model.getElementAt(realIndex); return element; } @@ -199,7 +199,7 @@ * Build layout. */ private void buildLayout() { - dataBox = new JComboBox(); + dataBox = new JComboBox<T>(); dataBox.addActionListener(new ComboBoxActionListener()); filterField = new JXTextField(_("isisfish.common.filter")); // fix size @@ -224,12 +224,12 @@ * * @param model model to set */ - public void setModel(ComboBoxModel model) { + public void setModel(ComboBoxModel<T> model) { model.addListDataListener(this); dataBox.setModel(new FilterComboBoxModel(model)); } - public ComboBoxModel getModel() { + public ComboBoxModel<T> getModel() { return ((FilterComboBoxModel)dataBox.getModel()).getModel(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.widget.filter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * this class is a concrete implementation of {@link FilterAcceptor} @@ -41,8 +39,6 @@ */ public class CompositeFilterAcceptor<M, T> implements FilterAcceptor<M, T> { - static private Log log = LogFactory.getLog(CompositeFilterAcceptor.class); - /** delegate Acceptor */ protected Acceptor<T> acceptor; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2013-03-11 16:48:16 UTC (rev 3820) @@ -30,8 +30,6 @@ javax.swing.event.HyperlinkListener javax.swing.text.html.HTMLFrameHyperlinkEvent javax.swing.event.HyperlinkEvent - java.io.PrintWriter - java.io.StringWriter fr.ifremer.isisfish.ui.widget.filter.FilterModel fr.ifremer.isisfish.ui.widget.filter.FilterParamModel Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -25,17 +25,16 @@ package fr.ifremer.isisfish.util; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.types.TimeStep; import java.lang.reflect.Method; import java.util.Map; + import org.apache.commons.collections.map.ReferenceMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.nuiton.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; + /** * Cache utilise pour mettre les resultats de methode durant la simulation * pour minimiser les appels @@ -49,9 +48,6 @@ * by : $Author$ */ public class Cache { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(Cache.class); // la longueur du package pour minimiser la longueur des topiaId static final private int entityPackageLenght = "fr.ifremer.isisfish.entities.".length(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -32,12 +32,10 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; +import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.TimeUnit; -import java.util.Map; -import java.util.WeakHashMap; /** * ConverterUtil. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -44,7 +44,7 @@ * * @param file the file to read, must not be {@code null} * @return the file contents, never {@code null} - * @since 4.2.2 + * @since 4.3.0 */ public static String readAsString(File file) throws IOException { return FileUtils.readFileToString(file, "utf-8"); @@ -55,7 +55,7 @@ * * @param file the file to write * @param content the content to write to the file - * @since 4.2.2 + * @since 4.3.0 */ public static void writeString(File file, String content) throws IOException { FileUtils.writeStringToFile(file, content, "utf-8"); 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-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-03-11 16:48:16 UTC (rev 3820) @@ -1,3 +1,4 @@ += 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 Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -32,15 +32,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; +import org.nuiton.util.config.ArgumentsParserException; import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.datastore.CodeSourceStorage.Location; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; -import java.io.IOException; /** * Abstract test case for isis fish. Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -26,7 +26,6 @@ package fr.ifremer.isisfish; import org.junit.Test; -import org.nuiton.util.ApplicationConfig; /** * Test for IsisConfig. Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.List; +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; -import org.junit.matchers.JUnitMatchers; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -84,7 +84,7 @@ population2.setName("thon"); allPopulation = populationDAO.findAll(); Assert.assertEquals(2, allPopulation.size()); - Assert.assertThat(allPopulation, JUnitMatchers.hasItem(population2)); + Assert.assertThat(allPopulation, CoreMatchers.hasItem(population2)); context.rollbackTransaction(); @@ -93,7 +93,7 @@ population3.setName("requin"); allPopulation = populationDAO.findAll(); Assert.assertEquals(2, allPopulation.size()); - Assert.assertThat(allPopulation, JUnitMatchers.hasItem(population3)); + Assert.assertThat(allPopulation, CoreMatchers.hasItem(population3)); context.commitTransaction(); simulation.closeStorage(); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -29,14 +29,12 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.nuiton.util.FileUtil; +import org.junit.Assert; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -119,10 +119,11 @@ // essai de chargement de la classe URL[] cp = new URL[] { f.getParentFile().toURI().toURL() }; - ClassLoader cl = new URLClassLoader(cp); - Class<?> c = cl.loadClass(filename); - log.info("class name: " + c.getName()); - Assert.assertEquals(filename, c.getName()); + try (URLClassLoader cl = new URLClassLoader(cp)) { + Class<?> c = cl.loadClass(filename); + log.info("class name: " + c.getName()); + Assert.assertEquals(filename, c.getName()); + } // delete File fclass = new File(f.getAbsolutePath().replaceAll("java$", "class")); @@ -158,18 +159,20 @@ // essai de chargement de la classe URL[] cp = new URL[] { dest.toURI().toURL() }; - ClassLoader cl = new URLClassLoader(cp); - Class<?> c = cl.loadClass(filenameB); - log.info("class name: " + c.getName()); - Assert.assertEquals(filenameB, c.getName()); + try (URLClassLoader cl = new URLClassLoader(cp)) { + Class<?> c = cl.loadClass(filenameB); + log.info("class name: " + c.getName()); + Assert.assertEquals(filenameB, c.getName()); + } // essai de chargement de la classe cp = new URL[] { dest.toURI().toURL() }; //URL[] cp = new URL[] { dest.toURL() }; - cl = new URLClassLoader(cp); - c = cl.loadClass(filenameA); - log.info("class name: " + c.getName()); - Assert.assertEquals(filenameA, c.getName()); + try (URLClassLoader cl = new URLClassLoader(cp)) { + Class<?> c = cl.loadClass(filenameA); + log.info("class name: " + c.getName()); + Assert.assertEquals(filenameA, c.getName()); + } // delete File fclassA = new File(fA.getAbsolutePath().replaceAll("java$", Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2013-03-11 14:42:28 UTC (rev 3819) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2013-03-11 16:48:16 UTC (rev 3820) @@ -133,7 +133,7 @@ SVNRepositoryFactory.createLocalRepository(remoteRepo, false, true); // ajout de source dans le repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnRoot = svnURL.appendPath("isis-fish-data", false); SVNURL svnTrunk = svnRoot.appendPath("trunk", false); @@ -598,7 +598,7 @@ vcs.checkout(null, true); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); @@ -641,7 +641,7 @@ vcs.checkout(null, true); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); @@ -696,7 +696,7 @@ vcs.checkout(null, true); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); @@ -799,7 +799,7 @@ vcs.checkout(null, false); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); @@ -828,7 +828,7 @@ vcs.checkout(null, false); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("scripts", false); @@ -970,7 +970,7 @@ vcs.checkout(null, false); // now, make a modification, on REMOTE repo - SVNURL svnURL = SVNURL.parseURIDecoded("file://" + remoteRepo.getAbsolutePath()); + SVNURL svnURL = SVNURL.parseURIEncoded("file://" + remoteRepo.getAbsolutePath()); SVNURL svnURLNewDir = svnURL.appendPath("isis-fish-data", false) .appendPath("trunk", false).appendPath("test", false); SVNClientManager svnManager = SVNClientManager.newInstance();

1 0

r3819 - branches/4.0.1
by echatellier＠users.forge.codelutin.com March 11, 2013

March 11, 2013

Author: echatellier Date: 2013-03-11 15:42:28 +0100 (Mon, 11 Mar 2013) New Revision: 3819 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3819 Log: fixes #2119 : Update to 1.7 version of tools.jar Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-03-11 13:56:33 UTC (rev 3818) +++ branches/4.0.1/pom.xml 2013-03-11 14:42:28 UTC (rev 3819) @@ -388,7 +388,7 @@ <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> - <version>1.6.0.16</version> + <version>1.7.0.13</version> <scope>compile</scope> </dependency>

1 0

r3818 - in branches/4.0.1: . src/license src/main/java/fr/ifremer/isisfish/simulator/sensitivity src/main/java/fr/ifremer/isisfish/ui/sensitivity/model src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard src/main/java/fr/ifremer/isisfish/util src/site/rst/v3/devel src/test/resources/mexico
by echatellier＠users.forge.codelutin.com March 11, 2013

March 11, 2013

Author: echatellier Date: 2013-03-11 14:56:33 +0100 (Mon, 11 Mar 2013) New Revision: 3818 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3818 Log: Update lib and use jdk 1.7 Modified: branches/4.0.1/pom.xml branches/4.0.1/src/license/THIRD-PARTY.properties branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java branches/4.0.1/src/site/rst/v3/devel/mexico.rst branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV3.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/pom.xml 2013-03-11 13:56:33 UTC (rev 3818) @@ -83,14 +83,14 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.0.2</version> + <version>2.0.6</version> <scope>runtime</scope> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.5</version> + <version>1.4.7</version> <scope>compile</scope> </dependency> @@ -180,14 +180,14 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.0</version> + <version>3.1.1</version> <scope>runtime</scope>  </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> <dependency> @@ -260,7 +260,7 @@ <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.4</version> + <version>1.6.5-1</version> <scope>compile</scope> </dependency> @@ -286,7 +286,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.168</version> + <version>1.3.170</version> <scope>compile</scope> </dependency> @@ -373,7 +373,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.6</version> + <version>1.7.8</version> <scope>compile</scope> </dependency>  @@ -522,13 +522,16 @@ <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <animal.sniffer.skip>true</animal.sniffer.skip>  - <jaxxVersion>2.5.6</jaxxVersion> - <eugeneVersion>2.5</eugeneVersion> - <topiaVersion>2.7</topiaVersion> + <jaxxVersion>2.5.12</jaxxVersion> + <eugeneVersion>2.6.1</eugeneVersion> + <topiaVersion>2.7.1</topiaVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.10</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> Modified: branches/4.0.1/src/license/THIRD-PARTY.properties =================================================================== --- branches/4.0.1/src/license/THIRD-PARTY.properties 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/license/THIRD-PARTY.properties 2013-03-11 13:56:33 UTC (rev 3818) @@ -1,15 +1,10 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ANTLR 3 License # - ASM License # - Apache Software License -# - Apache Software License Version 2.0 -# - Apache Software License, Version 1.1 # - Apache Software License, Version 2.0 # - BSD License -# - BSD licence -# - BSD style # - BSD-style license # - Bouncy Castle License # - CDDL @@ -17,13 +12,13 @@ # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence +# - GNU Library or Lesser General Public License # - GPL +# - GPL (with dual licensing option) # - GPLv2+CE -# - ICU License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license # - Java Transaction API (JTA) License -# - Jaxen license +# - LGPL, version 2.1 # - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -32,36 +27,34 @@ # - MIT License # - MPL 1.1 # - Mozilla Public License +# - New BSD License # - OpenMap Software License Agreement # - Revised BSD +# - Sequence Library License # - Sun's Binary Code License +# - TMate Open Source License (with dual licensing option) # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - http://sqljet.com/ -# - http://svnkit.com/license.html -# - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +# - Trilead Library License +# - http://jaxen.codehaus.org/license.html # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Apr 26 16:37:35 CEST 2012 +#Mon Mar 11 14:26:22 CET 2013 antlr--antlr--2.7.6=BSD License aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License -com.ibm.icu--icu4j--2.6.1=ICU License com.sun--tools--1.6.0.16=Sun's Binary Code License commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=Java Transaction API (JTA) License -jaxen--jaxen--1.1.1=Jaxen license -jdom--jdom--1.0=JDom license jrexx--jrexx--1.1.1=Apache Software License -net.java.dev.jna--jna--3.2.3=Lesser General Public License (LGPL v. 2.1) -org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.antlr--antlr-runtime--3.4=BSD License org.nuiton.thirdparty--JRI--0.8-4=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--REngine--0.6-1=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--Rserve--0.6-1=Lesser General Public License (LGPL v. 2.1) @@ -70,5 +63,3 @@ org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License qdox--qdox--1.4=Apache Software License, Version 2.0 trove--trove--1.0.2=Lesser General Public License (LGPL) -xalan--xalan--2.6.0=Apache Software License Version 2.0 -xerces--xercesImpl--2.6.2=Apache Software License, Version 1.1 Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -25,6 +25,8 @@ package fr.ifremer.isisfish.simulator.sensitivity; +import static org.nuiton.i18n.I18n._; + import java.io.File; import java.io.IOException; import java.util.Collection; @@ -42,6 +44,7 @@ import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.SensitivityExport; @@ -49,21 +52,21 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; public abstract class AbstractSensitivityAnalysis implements - SensitivityAnalysis { + SensitivityAnalysis { /** to use log facility, just put in your code: log.info("..."); */ - private static Log log = LogFactory - .getLog(AbstractSensitivityAnalysis.class); - + private static Log log = LogFactory.getLog(AbstractSensitivityAnalysis.class); + /** * Method to create the isis.factors dataframe in R. * * @param plan Design plan of the sensitivity analysis - * @param outputdirectory the directory on which we will calculate the - * destination RData file. The RData file will be named directory.RData and - * saved in the directory parent. + * @param outputdirectory the directory on which we will calculate the destination RData + * file. The RData file will be named directory.RData and saved + * in the directory parent. * - * @throws SensitivityException if an error occur while talking to R + * @throws SensitivityException + * if an error occur while talking to R */ public void setIsisFactorsR(DesignPlan plan, File outputdirectory) throws SensitivityException { @@ -79,24 +82,23 @@ String bsup = "Bsup<-c(%s)"; String bsupValues = ""; String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; - String isisfactors = "isis.factors<-data.frame(" + - "\"nomFacteur\"=nomFacteur," + - "\"Nominal\"=Nominal," + - "\"Continu\"=Continu," + - "\"Binf\"=Binf," + - "\"Bsup\"=Bsup)"; + String isisfactors = "isis.factors<-data.frame(" + + "\"nomFacteur\"=nomFacteur," + "\"Nominal\"=Nominal," + + "\"Continu\"=Continu," + "\"Binf\"=Binf," + "\"Bsup\"=Bsup)"; - //Create the vectors + // Create the vectors List<Factor> factors = plan.getFactors(); - for (Factor factor:factors){ - if (factor instanceof FactorGroup && ((FactorGroup) factor).isDiscrete()) { + for (Factor factor : factors) { + if (factor instanceof FactorGroup + && ((FactorGroup) factor).isDiscrete()) { List<Factor> subfactors = ((FactorGroup) factor).getFactors(); int cardinality = subfactors.get(0).getCardinality(); - for (Factor subfactor:subfactors) { + for (Factor subfactor : subfactors) { if (subfactor.getCardinality() != cardinality) { - throw new SensitivityException("All the factors of group " + - factor.getName() + " do not have the same cardinality"); + throw new SensitivityException( + "All the factors of group " + factor.getName() + + " do not have the same cardinality"); } } } @@ -112,37 +114,35 @@ bsupValues += ","; } - //Factor names + // Factor names factorNames += "\"" + factor.getName() + "\""; if (factor.getDomain() instanceof ContinuousDomain) { - //Continu values, binf values, bsup values and discrete factors attributes + // Continu values, binf values, bsup values and discrete factors + // attributes nominalValues += "\"" + factor.getNominalValue() + "\""; - //Continu values + // Continu values continuValues += "TRUE"; - //Binf values + // Binf values // FIXME echatellier to replace since 4.0.1 - /*binfValues += ((ContinuousDomain) factor.getDomain()) - .getCalculatorMinBound(); + binfValues += "0.0"; //((ContinuousDomain) factor.getDomain()).getCalculatorMinBound(); + //Bsup values bsupValues += ((ContinuousDomain) + bsupValues += "0.0"; //factor.getDomain()) .getCalculatorMaxBound(); - //Bsup values - bsupValues += ((ContinuousDomain) factor.getDomain()) - .getCalculatorMaxBound();*/ - } else { nominalValues += "\"" + factor.getNominalValue() + "\""; - //Continu values + // Continu values continuValues += "FALSE"; - //Binf values + // Binf values binfValues += "0.0"; - //Bsup values + // Bsup values bsupValues += ((DiscreteDomain) factor.getDomain()).getValues() .size(); } @@ -150,11 +150,10 @@ String Rcall; - try { REngine engine = new RProxy(); - //clear the engine (to be sure it's empty) + // clear the engine (to be sure it's empty) engine.clearSession(); Rcall = String.format(nomFacteur, factorNames); @@ -177,12 +176,12 @@ Rcall = String.format(attribute, "nomModel", "isis-fish-externeR"); engine.voidEval(Rcall); - for (Factor factor:factors) { + for (Factor factor : factors) { if (factor.getDomain() instanceof DiscreteDomain) { String attributeValues = "list("; - Collection<Object> values = ((DiscreteDomain) factor.getDomain()) - .getValues().values(); - for (Object j:values) { + Collection<Object> values = ((DiscreteDomain) factor + .getDomain()).getValues().values(); + for (Object j : values) { attributeValues += j + ","; } attributeValues = attributeValues.substring(0, @@ -195,9 +194,9 @@ } } - //Save the Isis R session + // Save the Isis R session engine.saveRData(outputdirectory.getParentFile(), - outputdirectory.getName()); + outputdirectory.getName()); } catch (RException eee) { if (log.isErrorEnabled()) { @@ -209,45 +208,85 @@ } - protected String editRInstruction(String rCall){ - JLabel label = new JLabel( - "Modifier le code R envoyé si vous le souhaitez"); - JTextPane text = new JTextPane(); - text.setText(rCall); - text.setSize(400, 400); - text.setPreferredSize(text.getSize()); + /** + * Affiche une boite de dialogue modale permettant de modifier l'expression + * R. + * + * @param rCall r instruction to edit + * @return user edited r instruction + */ + protected String editRInstruction(String rCall) { + JLabel label = new JLabel(_("Modifier le code R envoyé si vous le souhaitez")); + JTextPane text = new JTextPane(); + text.setText(rCall); + text.setSize(400, 400); + text.setPreferredSize(text.getSize()); - Box box = Box.createVerticalBox(); - box.add(label); - box.add(new JScrollPane(text)); + Box box = Box.createVerticalBox(); + box.add(label); + box.add(new JScrollPane(text)); - JOptionPane.showMessageDialog(null, box, "R modif", - JOptionPane.QUESTION_MESSAGE); - return text.getText(); + JOptionPane.showMessageDialog(null, box, _("R modif"), JOptionPane.QUESTION_MESSAGE); + return text.getText(); } - protected void testNoDiscrete(List<Factor> factors) throws SensitivityException{ - for (Factor factor:factors) { + /** + * Test que tous les facteurs sont continues. Leve une exception si un + * facteur discret est présent. + * + * @param factors factor list to check + * @throws SensitivityException + */ + protected void checkAllFactorContinuous(List<Factor> factors) + throws SensitivityException { + for (Factor factor : factors) { if (factor.getDomain() instanceof DiscreteDomain) { - throw new SensitivityException(factor.getName() + - " has a discrete domain, this is not acceptable for " + - "this method."); + throw new SensitivityException(_("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); } } } - protected String createImportInstruction( - SensitivityExport export, + /** + * Test que tous les facteurs sont continues. Leve une exception si un + * facteur discret est présent. + * + * @param factors factor list to check + * @throws SensitivityException + */ + protected void checkAllUniformDistribution(List<Factor> factors) + throws SensitivityException { + for (Factor factor : factors) { + if (factor.getDomain() instanceof ContinuousDomain) { + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + Distribution distribution = domain.getDistribution(); + if (distribution != Distribution.QUNIFPC && distribution != Distribution.QUNIFMM) { + throw new SensitivityException(_("%s has a non uniform distribution, this is not acceptable for this method.", factor.getName())); + } + } else { + throw new SensitivityException(_("%s has a discrete domain, this is not acceptable for this method.", factor.getName())); + } + } + } + + /** + * Cree l'instruction R qui permet de relire le contenu d'un fichier genere + * par un Export Isis. + * + * @param export export to get filename to read + * @param simulationStorages simulation list to read export + * @return r instruction + */ + protected String createImportInstruction(SensitivityExport export, List<SimulationStorage> simulationStorages) { - //the filename to read + // the filename to read String name = export.getExportFilename(); - //the extension to read + // the extension to read String extension = export.getExtensionFilename(); - //the rInstruction + // the rInstruction String rInstruction = name + "<-c("; - //iterate on all the simulations and read the value for each one + // iterate on all the simulations and read the value for each one for (int l = 0; l < simulationStorages.size(); l++) { SimulationStorage simulationStorage = simulationStorages.get(l); @@ -258,15 +297,13 @@ File importFile = new File(directoryPath, name + extension); - String simulResult=""; - try{ + String simulResult = ""; + try { simulResult = FileUtils.readFileToString(importFile); } catch (IOException ioe) { - log.error ("An error occured trying to read a result file : " + - ioe.getMessage()); + log.error("An error occured trying to read a result file : ", ioe); } - double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -280,12 +317,18 @@ return rInstruction; } + /** + * Renome les objets R en les prefixant par l'identifiant de la simulation. + * + * @param engine r engine + * @param simulationName simulation name + * @throws RException + */ protected void renameObjects(REngine engine, String simulationName) throws RException { String renameIsisSimule = "%s.isis.simule<-isis.simule"; - String renameIsisFactorDistribution = "%s.isis.factor.distribution" + - "<-isis.factor.distribution"; + String renameIsisFactorDistribution = "%s.isis.factor.distribution<-isis.factor.distribution"; String renameIsisFactor = "%s.isis.factor<-isis.factors"; String renameIsisMethodExp = "%s.isis.methodExp<-isis.MethodExp"; @@ -299,4 +342,71 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); } + /** + * Get factor domain min bound depending on distribution. + */ + protected double getMinBound(Factor factor) { + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + Distribution distribution = domain.getDistribution(); + double result = 0; + if (distribution == Distribution.QUNIFPC) { + Object reference = (Double)domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); + if (reference instanceof MatrixND) { + result = 1; + } else { + Double coefficient = (Double)domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[1].getName()); + result = (Double)reference - ((Double)reference * coefficient); + } + } else if (distribution == Distribution.QUNIFMM) { + Object min = domain.getDistributionParameter(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); + // pour les matrices, on prend 1 et on multipliera le retour + // de R sur la matrice pour faire varier la matrice completement + // note: on ne fait pas ca pour les réels car les utilisateurs + // prefere avoir les valeurs réelles dans le RData. + if (min instanceof MatrixND) { + result = 1; + } else { + result = (Double)min; + } + } else { + if (log.isWarnEnabled()) { + log.warn("Can't call getMinBound for distribution " + distribution); + } + } + return result; + } + + /** + * Get factor domain max bound depending on distribution. + */ + protected double getMaxBound(Factor factor) { + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + Distribution distribution = domain.getDistribution(); + double result = 0; + if (distribution == Distribution.QUNIFPC) { + Object reference = (Double)domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); + if (reference instanceof MatrixND) { + result = 1; + } else { + Double coefficient = (Double)domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[1].getName()); + result = (Double)reference + ((Double)reference * coefficient); + } + } else if (distribution == Distribution.QUNIFMM) { + Object max = domain.getDistributionParameter(Distribution.QUNIFMM.getDistibutionParams()[1].getName()); + // pour les matrices, on prend 1 et on multipliera le retour + // de R sur la matrice pour faire varier la matrice completement + // note: on ne fait pas ca pour les réels car les utilisateurs + // prefere avoir les valeurs réelles dans le RData. + if (max instanceof MatrixND) { + result = 1; + } else { + result = (Double)max; + } + } else { + if (log.isWarnEnabled()) { + log.warn("Can't call getMaxBound for distribution " + distribution); + } + } + return result; + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -40,49 +38,71 @@ public enum Distribution { QUNIFPC(_("QUnif %"), + "runif", new DistributionParam("reference", _("Reference value"), true), new DistributionParam("coefficient", _("Coefficient"))), QUNIFMM(_("QUnif Min/Max"), + "runif", new DistributionParam("min", _("Minimum value"), true), new DistributionParam("max", _("Maximum value"), true)), DBINOM(_("Dbimom"), + "rbinom", new DistributionParam("size", _("number of trials (zero or more)")), new DistributionParam("prob", _("probability of success on each trial"))), DCAUCHY(_("dcauchy"), + "rcauchy", new DistributionParam("location", _("location and scale parameters. (location = 0, scale = 1)")), new DistributionParam("scale", _("location and scale parameters. (location = 0, scale = 1)"))), DCHISQ(_("dchisq"), + "rchisq", new DistributionParam("df", _("degrees of freedom (non-negative, but can be non-integer)")), new DistributionParam("ncp", _("non-centrality parameter (non-negative)."))), DEXP(_("dexp"), + "rexp", new DistributionParam("rate", _("vector of rates"))), DF(_("df"), + "rf", new DistributionParam("df1", _("degrees of freedom. 'Inf' is allowed")), new DistributionParam("df2", _("degrees of freedom. 'Inf' is allowed")), new DistributionParam("ncp", _("non-centrality parameter. If omitted the central F is assumed"))), DGAMMA(_("dgamma"), + "rgamma", + new DistributionParam("shape", _("shape and scale parameters. Must be positive, 'scale' strictly")), new DistributionParam("rate", _("an alternative way to specify the scale.")), - new DistributionParam("shape", _("shape and scale parameters. Must be positive, 'scale' strictly")), new DistributionParam("scale", _("shape and scale parameters. Must be positive, 'scale' strictly"))), DGEOM(_("dgeom"), + "rgeom", new DistributionParam("prob", _("probability of success in each trial. '0 < prob <= 1'"))), DHYPER(_("dhyper"), + "rhyper", new DistributionParam("m", _("the number of white balls in the urn.")), new DistributionParam("n", _("the number of black balls in the urn.")), new DistributionParam("k", _("the number of balls drawn from the urn."))), DLNORM(_("dlnorm"), + "rlnorm", new DistributionParam("meanlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively.")), new DistributionParam("sdlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."))); protected String description; + protected String instruction; + protected DistributionParam[] params; - private Distribution(String description, DistributionParam... params) { + private Distribution(String description, String instruction, DistributionParam... params) { this.description = description; + this.instruction = instruction; this.params = params; } + public String getDescription() { + return description; + } + + public String getInstruction() { + return instruction; + } + public DistributionParam[] getDistibutionParams() { return params; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -9,7 +9,7 @@ * %% * 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 + * 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, @@ -19,7 +19,7 @@ * * 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-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -7,7 +7,7 @@ * %% * 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 + * 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, @@ -17,7 +17,7 @@ * * 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-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2013-03-11 13:56:33 UTC (rev 3818) @@ -9,7 +9,7 @@ %% 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 + 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, @@ -19,7 +19,7 @@ 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-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <ContinuousPanel layout="{new BorderLayout()}"> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx 2013-03-11 13:56:33 UTC (rev 3818) @@ -9,7 +9,7 @@ %% 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 + 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, @@ -19,7 +19,7 @@ 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-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> @@ -143,4 +143,4 @@ </cell> </row> </Table> -</JDialog> \ No newline at end of file +</JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -7,7 +7,7 @@ * %% * 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 + * 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, @@ -17,7 +17,7 @@ * * 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-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ScriptUtil.java 2013-03-11 13:56:33 UTC (rev 3818) @@ -1,5 +1,29 @@ package fr.ifremer.isisfish.util; +/* + * #%L + * IsisFish + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2013 Ifremer, Codelutin + * %% + * 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.File; import java.io.IOException; Modified: branches/4.0.1/src/site/rst/v3/devel/mexico.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/devel/mexico.rst 2013-03-11 13:14:28 UTC (rev 3817) +++ branches/4.0.1/src/site/rst/v3/devel/mexico.rst 2013-03-11 13:56:33 UTC (rev 3818) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * IsisFish +.. * $Id:$ +.. * $HeadURL:$ +.. * %% +.. * Copyright (C) 1999 - 2013 Ifremer, Codelutin +.. * %% +.. * 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Mexico ------ Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV3.xml =================================================================== (Binary files differ)

1 0

r3817 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/simulator/sensitivity src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/util src/main/resources/i18n src/main/resources/templates/script
by echatellier＠users.forge.codelutin.com March 11, 2013

March 11, 2013

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>  <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>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: 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>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 @@ -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;

1 0