Author: chatellier Date: 2011-07-15 13:12:45 +0000 (Fri, 15 Jul 2011) New Revision: 3445 Log: Refactoring : - analyseplan > simulationplan - sensitivity > sensitivityanalysis Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/doc/Todo.rst isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java isis-fish/trunk/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish_fr_FR.properties isis-fish/trunk/src/main/resources/log4j.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/changelog.txt 2011-07-15 13:12:45 UTC (rev 3445) @@ -1,5 +1,8 @@ -isis-fish (3.4.0.0) test; urgency=low +isis-fish (4.0.0.0) test; urgency=low + * Rename Date to TimeStep + * Rename AnalysePlan to SimulationPlan + * Rename SensitivityCalculator to SensitivityAnalysis * Sensitivity calculator parameters are not lost anymore * Add new community repository with commit access for users * Remove maturity group unique constraints Modified: isis-fish/trunk/doc/Todo.rst =================================================================== --- isis-fish/trunk/doc/Todo.rst 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/doc/Todo.rst 2011-07-15 13:12:45 UTC (rev 3445) @@ -30,7 +30,7 @@ - expliquer comment debugguer avec NetBeans - mettre les valeurs pas defaut sur les champs -Pour la version 4.0.0.0: +Pour la version 5.0.0.0: - db4o (test de perf pour simulation, sauvegarde/rendu des resultats) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -1055,11 +1055,11 @@ public static enum Action { HELP(n_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), VERSION(n_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), - - IMPORT_ANALYSE_PLAN(n_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"), + IMPORT_EXPORT(n_(""), ImportAction.class.getName() + "#importExport", "--importExport"), IMPORT_RULE(n_(""), ImportAction.class.getName() + "#importRule", "--importRule"), IMPORT_SCRIPT(n_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), + IMPORT_SIMULATION_PLAN(n_(""), ImportAction.class.getName() + "#importSimulationPlan", "--importSimulationPlan"), IMPORT_SIMULATOR(n_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), IMPORT_FORMULA(n_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), IMPORT_REGION(n_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), @@ -1067,19 +1067,19 @@ IMPORT_SIMULATION(n_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), IMPORT_SCRIPT_MODULE(n_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), - LIST_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"), LIST_EXPORT(n_(""), ExportAction.class.getName() + "#listExport", "--listExport"), LIST_RULE(n_(""), ExportAction.class.getName() + "#listRule", "--listRule"), LIST_SCRIPT(n_(""), ExportAction.class.getName() + "#listScript", "--listScript"), + LIST_SIMULATION_PLAN(n_(""), ExportAction.class.getName() + "#listSimulationPlan", "--listSimulationPlan"), LIST_SIMULATOR(n_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), LIST_FORMULA(n_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), LIST_REGION(n_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), LIST_SIMULATION(n_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), - EXPORT_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"), EXPORT_EXPORT(n_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), EXPORT_RULE(n_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), EXPORT_SCRIPT(n_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), + EXPORT_SIMULATION_PLAN(n_(""), ExportAction.class.getName() + "#exportSimulationPlan", "--exportSimulationPlan"), EXPORT_SIMULATOR(n_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), EXPORT_FORMULA(n_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), EXPORT_REGION(n_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -112,6 +112,16 @@ // permet de faire fonctionner la compilation en webstart System.setSecurityManager(null); + // i18n is not inited here + if (log.isInfoEnabled()) { + log.info("Starting Isis-Fish " + IsisConfig.getVersion() + " with args : " + java.util.Arrays.toString(args)); + log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); + log.info("Java version: " + System.getProperty("java.runtime.version") + ", " + System.getProperty("java.vm.name")); + log.info("System arch: " + System.getProperty("os.arch")); + log.info("R_HOME: " + System.getenv("R_HOME") + ", R.type: " + System.getProperty("R.type")); + log.info("PATH: " + System.getenv("PATH")); + } + // initialisation de l'application init(args); @@ -207,16 +217,6 @@ */ public static void init(String... args) throws Exception { - // i18n is not inited here - if (log.isInfoEnabled()) { - log.info("Starting Isis-Fish " + IsisConfig.getVersion() + " with args : " + java.util.Arrays.toString(args)); - log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); - log.info("Java version: " + System.getProperty("java.runtime.version") + ", " + System.getProperty("java.vm.name")); - log.info("System arch: " + System.getProperty("os.arch")); - log.info("R_HOME: " + System.getenv("R_HOME") + ", R.type: " + System.getProperty("R.type")); - log.info("PATH: " + System.getenv("PATH")); - } - // parsing des options à partir des arguments passés config = new IsisConfig(); config.parse(args); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -58,7 +58,7 @@ this.config = config; } - public void importAnalysePlan(boolean force, File file) throws Exception { + public void importSimulationPlan(boolean force, File file) throws Exception { String name = file.getName(); SimulationPlanStorage storage = SimulationPlanStorage.getSimulationPlan(name); if(!force && storage.exists()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -68,7 +68,7 @@ @Expression("execution(* scripts..*(..))" + " || execution(* simulators..*(..))" + " || execution(* rules..*(..)) " - + " || execution(* analyseplans..*(..)) " + + " || execution(* simulationplans..*(..)) " + " || execution(* formules..*(..))") Pointcut executeMethod; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -207,7 +207,7 @@ * <b>Be ware this method require to instanciate a Rule, so * it would be better to call as often as possible.</b> * - * @return the descript of the instanciate AnalysePlan + * @return the descript of the instanciate Rule * @see Doc * @see Docable */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -43,8 +43,8 @@ import fr.ifremer.isisfish.vcs.VCSException; /** - * Class permettant de representer un plan d'analyse. - * Un plan d'analyse est un fichier Java que l'on compile si besoin. + * Class permettant de representer un plan de simulation. + * Un plan de simulation est un fichier Java que l'on compile si besoin. * <p/> * Gere les fichiers VCS de type {@link SimulationPlan} (package simulationplans) * @@ -56,14 +56,14 @@ * * Last update: $Date$ by : $Author$ */ -public class SimulationPlanStorage extends JavaSourceStorage { // AnalysePlanStorage +public class SimulationPlanStorage extends JavaSourceStorage { // SimulationPlanStorage /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(SimulationPlanStorage.class); public final static String SIMULATION_PLAN_PATH = "simulationplans"; - /** Template freemarker pour les plans d'analyse . */ + /** Template freemarker pour les plans de simulation . */ public static final String SIMULATION_PLAN_TEMPLATE = "templates/script/simulationplan.ftl"; @SuppressWarnings("unchecked") @@ -202,10 +202,10 @@ } /** - * <b>Be ware this method require to instanciate a AnalysePlan, so + * <b>Be ware this method require to instanciate a SimulationPlan, so * it would be better to call as often as possible.</b> * - * @return the descript of the instanciate AnalysePlan + * @return the descript of the instanciate SimulationPlan * @see Doc * @see Docable */ @@ -220,5 +220,4 @@ return result; } -} // AnalysePlanStorage - +} // SimulationPlanStorage Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2011 CodeLutin + * Copyright (C) 1999 - 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/package-info.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/package-info.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2011 CodeLutin + * Copyright (C) 1999 - 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -52,13 +52,13 @@ description(String.class), simulationName(String.class), simulatorName(String.class), - analysePlanName(String.class), + simulationPlanName(String.class), regionName(String.class), otherInfo(String.class), // int numberOfYear(Integer.class), - analysePlanNumber(Integer.class), + simulationPlanNumber(Integer.class), // date interval simulationInterval(DateInterval.class) { @@ -75,7 +75,7 @@ // boolean useOptimization(Boolean.class), - useAnalysePlan(Boolean.class), + useSimulationPlan(Boolean.class), useStatistic(Boolean.class), usePreScript(Boolean.class), onlyExport(Boolean.class), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -124,7 +124,7 @@ /** * Add extra rules. * - * Appelé par les plan d'analyse, pour ajouter des regles supplémentaires + * Appelé par les plan de simulation, pour ajouter des regles supplémentaires * dans être integrés au zip. * * @param extraRules extra rules to add @@ -329,32 +329,32 @@ List<SensitivityExport> sensitivityExport); /** - * Get use analyse plans property. + * Get use simulation plans property. * - * @return use analyse plan. + * @return use simulation plan. */ - public abstract boolean getUseAnalysePlan(); + public abstract boolean getUseSimulationPlan(); /** - * Set use analyse plans property. + * Set use simulation plans property. * - * @param useAnalysePlan use analyse plan to set + * @param useSimulationPlan use simulation plan to set */ - public abstract void setUseAnalysePlan(boolean useAnalysePlan); + public abstract void setUseSimulationPlan(boolean useSimulationPlan); /** - * Get simulation number in analyse plan. + * Get simulation number in simulation plan. * - * @return simulation number in analyse plan + * @return simulation number in simulation plan */ - public abstract int getAnalysePlanNumber(); + public abstract int getSimulationPlanNumber(); /** - * Set simulation number in analyse plan. + * Set simulation number in simulation plan. * - * @param analysePlanNumber analyse plan number to set + * @param simulationPlanNumber simulation plan number to set */ - public abstract void setAnalysePlanNumber(int analysePlanNumber); + public abstract void setSimulationPlanNumber(int simulationPlanNumber); /** * Get number of year to run to simulate. @@ -578,9 +578,9 @@ * <ul> * <li>strategies</li> * <li>rules</li> - * <li>analyseplans</li> + * <li>simulationplans</li> * <li>sensitivityexports</li> - * <li>calculator</li> + * <li>sensitivityanalysis</li> * </ul> * * @return L'objet Properties representant les parametres Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -76,13 +76,13 @@ /** Parameter memory reference. */ protected SoftReference<SimulationParameter> ref; - + /** * * @param param param to cache */ public SimulationParameterCache(SimulationParameter param) { - + try { paramFile = File.createTempFile("isis-fish-param", ".properties"); paramFile.deleteOnExit(); @@ -91,10 +91,10 @@ catch (IOException eee) { throw new IsisFishRuntimeException("Can't cache param to disk", eee); } - + ref = new SoftReference<SimulationParameter>(param); } - + protected void store(SimulationParameter param) { Properties prop = param.toProperties(); Writer writer = null; @@ -497,41 +497,41 @@ } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseAnalysePlan() + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseSimulationPlan() */ @Override - public boolean getUseAnalysePlan() { + public boolean getUseSimulationPlan() { SimulationParameter param = getParam(); - return param.getUseAnalysePlan(); + return param.getUseSimulationPlan(); } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseAnalysePlan(boolean) + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseSimulationPlan(boolean) */ @Override - public void setUseAnalysePlan(boolean useAnalysePlan) { + public void setUseSimulationPlan(boolean useSimulationPlan) { SimulationParameter param = getParam(); - param.setUseAnalysePlan(useAnalysePlan); + param.setUseSimulationPlan(useSimulationPlan); store(param); } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getAnalysePlanNumber() + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimualtionPlanNumber() */ @Override - public int getAnalysePlanNumber() { + public int getSimulationPlanNumber() { SimulationParameter param = getParam(); - return param.getAnalysePlanNumber(); + return param.getSimulationPlanNumber(); } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setAnalysePlanNumber(int) + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) */ @Override - public void setAnalysePlanNumber(int analysePlanNumber) { + public void setSimulationPlanNumber(int simulationPlanNumber) { SimulationParameter param = getParam(); - param.setAnalysePlanNumber(analysePlanNumber); + param.setSimulationPlanNumber(simulationPlanNumber); store(param); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -123,7 +123,7 @@ /** La liste des regles de gestions a utiliser pour la simulation. */ protected List<Rule> rules; - /** La liste des regles potentiellement ajoutée par les plans d'analyse. */ + /** La liste des regles potentiellement ajoutée par les plans de simulation. */ protected List<String> extraRules; /** La liste des plans a utiliser pour la simulation. */ @@ -138,14 +138,14 @@ /** Le script de pre simulation a utiliser. */ protected String preScript; - /** Utilisation du plan d'analyse. */ - protected Boolean useAnalysePlan; + /** Utilisation du plan de simulation. */ + protected Boolean useSimulationPlan; /** - * Le numero de sequence de la liste des plans d'analyse. Le premier + * Le numero de sequence de la liste des plans de simulation. Le premier * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un * plan la valeur est -1. */ - protected Integer analysePlanNumber; + protected Integer simulationPlanNumber; /** Export utilisés pour les analyses de sensibilités. */ protected List<SensitivityExport> sensitivityExports; @@ -464,7 +464,7 @@ } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeAnalysePlan(fr.ifremer.isisfish.simulator.SimulationPlan) + * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeSimulationPlan(fr.ifremer.isisfish.simulator.SimulationPlan) */ @Override public boolean removeSimulationPlan(SimulationPlan plan) { @@ -472,7 +472,7 @@ } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getAnalysePlans() + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulationPlans() */ @Override public List<SimulationPlan> getSimulationPlans() { @@ -481,7 +481,7 @@ simulationPlans = new ArrayList<SimulationPlan>(); if (propertiesParameters != null) { - // analyse plan + // simulation plan String[] planList = propertiesParameters.getProperty("plans", "").split(","); int planIndex = 0; @@ -855,51 +855,51 @@ * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseAnalysePlan() */ @Override - public boolean getUseAnalysePlan() { + public boolean getUseSimulationPlan() { - if (useAnalysePlan == null) { + if (useSimulationPlan == null) { if (propertiesParameters != null) { - useAnalysePlan = Boolean.valueOf(propertiesParameters.getProperty("useAnalysePlan", "false")); + useSimulationPlan = Boolean.valueOf(propertiesParameters.getProperty("useSimulationPlan", "false")); } else { - useAnalysePlan = Boolean.FALSE; + useSimulationPlan = Boolean.FALSE; } } - return this.useAnalysePlan; + return this.useSimulationPlan; } /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseAnalysePlan(boolean) */ @Override - public void setUseAnalysePlan(boolean useAnalysePlan) { - this.useAnalysePlan = useAnalysePlan; + public void setUseSimulationPlan(boolean useSimulationPlan) { + this.useSimulationPlan = useSimulationPlan; } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getAnalysePlanNumber() + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulationPlanNumber() */ @Override - public int getAnalysePlanNumber() { + public int getSimulationPlanNumber() { - if (analysePlanNumber == null) { + if (simulationPlanNumber == null) { if (propertiesParameters != null) { - analysePlanNumber = Integer.valueOf(propertiesParameters.getProperty("analysePlanNumber", "-1")); + simulationPlanNumber = Integer.valueOf(propertiesParameters.getProperty("simulationPlanNumber", "-1")); } else { - analysePlanNumber = Integer.valueOf(-1); + simulationPlanNumber = Integer.valueOf(-1); } } - return this.analysePlanNumber.intValue(); + return this.simulationPlanNumber.intValue(); } /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setAnalysePlanNumber(int) + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) */ @Override - public void setAnalysePlanNumber(int analysePlanNumber) { - this.analysePlanNumber = analysePlanNumber; + public void setSimulationPlanNumber(int simulationPlanNumber) { + this.simulationPlanNumber = simulationPlanNumber; } /* @@ -1313,8 +1313,8 @@ result.useStatistic = getUseStatistic(); result.usePreScript = getUsePreScript(); result.preScript = getPreScript(); - result.useAnalysePlan = getUseAnalysePlan(); - result.analysePlanNumber = getAnalysePlanNumber(); + result.useSimulationPlan = getUseSimulationPlan(); + result.simulationPlanNumber = getSimulationPlanNumber(); if (exportNames != null) { result.exportNames = new LinkedList<String>(exportNames); } @@ -1375,9 +1375,9 @@ result.append(getDescription()).append('\n'); result.append("--------------------\n"); - if (getUseAnalysePlan()) { + if (getUseSimulationPlan()) { result.append(_("isisfish.params.toString.plan.number", - getAnalysePlanNumber())); + getSimulationPlanNumber())); } RegionStorage region = getRegion(); @@ -1424,7 +1424,7 @@ } result.append("\n\n"); - // analyse plans + // simulation plans for (SimulationPlan plan : getSimulationPlans()) { String name = RuleStorage.getName(plan); String param = ""; @@ -1571,11 +1571,11 @@ result.setProperty("numberOfSensitivitySimulation", String .valueOf(getNumberOfSensitivitySimulation())); - // calculator name + // analysis name if (sensitivityAnalysis != null) { - String calculatorName = SensitivityAnalysisStorage + String analysisName = SensitivityAnalysisStorage .getName(getSensitivityAnalysis()); - result.setProperty("sensitivitycalculator", calculatorName); + result.setProperty("sensitivityanalysis", analysisName); // calculator parameter Properties calculatorParams = StorageHelper.getParamsAsProperties(0, @@ -1583,9 +1583,9 @@ result.putAll(calculatorParams); } else { if (propertiesParameters != null - && propertiesParameters.containsKey("sensitivitycalculator")) { + && propertiesParameters.containsKey("sensitivityanalysis")) { result.setProperty("sensitivitycalculator", - propertiesParameters.getProperty("sensitivitycalculator")); + propertiesParameters.getProperty("sensitivityanalysis")); for (String key : propertiesParameters.stringPropertyNames()) { if (key.startsWith("sensitivity.")) { result.setProperty(key, propertiesParameters.getProperty(key)); @@ -1621,8 +1621,8 @@ result.setProperty("usePreScript", String.valueOf(getUsePreScript())); result.setProperty("preScript", getPreScript()); - result.setProperty("useAnalysePlan", String.valueOf(getUseAnalysePlan())); - result.setProperty("analysePlanNumber", String.valueOf(getAnalysePlanNumber())); + result.setProperty("useSimulationPlan", String.valueOf(getUseSimulationPlan())); + result.setProperty("simulationPlanNumber", String.valueOf(getSimulationPlanNumber())); String resultList = ""; for (String r : getResultEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -46,13 +46,13 @@ /** Simulation id. */ protected String id; - /** Analyse plan number. */ + /** Simulation plan number. */ protected int number = 0; /** Simulation parameters. */ protected SimulationParameter param; - /** Additionnal context values. */ + /** Additional context values. */ protected Map<String, Object> values = new HashMap<String, Object>(); public SimulationPlanContext(String id, SimulationParameter param) { @@ -70,7 +70,7 @@ } /** - * Get current analyze plan simulation count. + * Get current simulation plan simulation count. * * Warning, in after simulation, refer to generated simulation count, * not ended simulation number. @@ -79,7 +79,7 @@ * * @return the number * - * @deprecated use {@code nextSimulation.getParameter().getAnalysePlanNumber()} + * @deprecated use {@code nextSimulation.getParameter().getSimulationPlanNumber()} */ public int getNumber() { return number; @@ -138,7 +138,7 @@ } /** - * Get {@link SimulationStorage} for specified analyse plan number. + * Get {@link SimulationStorage} for specified simulation plan number. * * @param number number * @return {@link SimulationStorage} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -64,7 +64,7 @@ SimulationStorage simulation = context.getSimulationStorage(); SimulationParameter parameters = simulation.getParameter(); String presimulationScript = parameters.getPreScript(); - if ((parameters.getUsePreScript() || parameters.getUseAnalysePlan()) + if ((parameters.getUsePreScript() || parameters.getUseSimulationPlan()) && presimulationScript != null && !"".equals(presimulationScript)) { @@ -78,7 +78,6 @@ bsh.eval("import org.nuiton.topia.persistence.*;"); bsh.eval("import fr.ifremer.isisfish.*;"); bsh.eval("import fr.ifremer.isisfish.types.*;"); - bsh.eval("import fr.ifremer.isisfish.types.Date;"); bsh.eval("import fr.ifremer.isisfish.entities.*;"); bsh.eval("import java.util.*;"); bsh.eval(presimulationScript); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -31,7 +31,6 @@ * Created: Fri Sep 6 2002 * * @author <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -56,14 +56,13 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; -import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.ssh.InvalidPassphraseException; import fr.ifremer.isisfish.util.ssh.ProgressMonitor; import fr.ifremer.isisfish.util.ssh.SSHAgent; import fr.ifremer.isisfish.util.ssh.SSHException; import fr.ifremer.isisfish.util.ssh.SSHUserInfo; import fr.ifremer.isisfish.util.ssh.SSHUtils; -import freemarker.cache.TemplateLoader; +import freemarker.cache.ClassTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; @@ -149,7 +148,7 @@ freemarkerConfiguration.setDefaultEncoding("utf-8"); // specific template loader to get template from jars (classpath) - TemplateLoader templateLoader = new ClasspathTemplateLoader(); + ClassTemplateLoader templateLoader = new ClassTemplateLoader(SSHSimulatorLauncher.class, "/"); freemarkerConfiguration.setTemplateLoader(templateLoader); } @@ -1090,7 +1089,8 @@ * @throws IOException if can't get script content */ protected String getSimulationScriptLaunchContent(String templateName, - String simuationId, String simulationZip, boolean standaloneZip, String simulationZipResult, String preScriptPath, boolean multipleSimulationScript) + String simuationId, String simulationZip, boolean standaloneZip, + String simulationZipResult, String preScriptPath, boolean multipleSimulationScript) throws IOException { String scriptContent = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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 @@ -62,7 +62,7 @@ /** Le {@link SimulationService} dans lequel a ete cree ce job */ protected SimulationService simulationService; /** si non null contient le {@link SimulationJob} qui a genere ce job, ca - * veut dire que ce job est du a un plan d'analyse*/ + * veut dire que ce job est du a un plan de simulation*/ protected SimulationJob parentJob; /** item contenant les infos de la simulation */ protected SimulationItem item; @@ -190,7 +190,7 @@ /** * Fait la simulation. La simulation en elle meme est delegue au * {@link SimulatorLauncher}. Le travail restant ici est le nettoyage, - * la gestion des erreurs ou l'iteration s'il sagit de plan d'analyse + * la gestion des erreurs ou l'iteration s'il sagit de plan de simulation * dependant. */ public void run() { @@ -211,8 +211,8 @@ simulationService.fireStartEvent(this); if (!onlyCheckControl && getParentJob() == null - && param.getUseAnalysePlan() && !param.isIndependentPlan()) { - // on est sur un plan d'analyse dependant, il faut generer les + && param.getUseSimulationPlan() && !param.isIndependentPlan()) { + // on est sur un plan de simulation dependant, il faut generer les // simulation les unes apres les autres SimulationService.PrepareSimulationJob i = new SimulationService.PrepareSimulationJob( simulationService, this); @@ -320,7 +320,7 @@ if (param.getOnlyExport()) { // pour les plan dependant il faut le faire apres toutes // les simulations donc pas ici - if (getParentJob() == null || param.getUseAnalysePlan() + if (getParentJob() == null || param.getUseSimulationPlan() && param.isIndependentPlan()) { simulation.delete(false); } @@ -350,13 +350,13 @@ } } } /*finally { - simulationService.fireStopEvent(this); - } */ + simulationService.fireStopEvent(this); + } */ } /** * Interface permettant d'implanter des actions a faire apres la simulation. - * Ces actions ne se declenchent pas pour les job de plan d'analyse pere. + * Ces actions ne se declenchent pas pour les job de plan de simulation pere. */ public static interface PostAction { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -619,7 +619,7 @@ } } - // sensitivity calculator analyze result call + // sensitivity analysis result call // can't do analyze second pass if simulation // has been deleted if (simulationAvailable) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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 @@ -289,7 +289,7 @@ /** * Supprime le job de la liste des jobs en cours et l'ajoute le job si * besoin a la liste des jobs faits (s'il y a une erreur ou qu'il ne sagit - * pas d'une simulation lancer par un plan d'analyse). + * pas d'une simulation lancer par un plan de simulation). * Les listener sont prevenu par la méthode * {@link SimulationServiceListener#simulationStop(SimulationService, SimulationJob)}. * @param job @@ -374,7 +374,7 @@ SimulatorLauncher launcher, int priority) { // make deep copy, ui, still work with - // copy need to be deep for analyze plan to reload + // copy need to be deep for simulation plan to reload SimulationParameter localParameters = param.deepCopy(); // on l'ajoute tout de suite a la liste des simulations demandee @@ -384,11 +384,11 @@ job.setLauncher(launcher); fireStartEvent(job); - // Attention, dans le cas d'un plan d'analyse, le new PrepareSimulationJob + // Attention, dans le cas d'un plan de simulation, le new PrepareSimulationJob // doit etre fait AVANT de faire le prepareSimulationZipFile // car, il est possible que l'init des plans ajoute des regles !!! PrepareSimulationJob task = null; - if (localParameters.getUseAnalysePlan()) { + if (localParameters.getUseSimulationPlan()) { task = new PrepareSimulationJob(this, job); } @@ -396,8 +396,8 @@ File zip = prepareSimulationZipFile(control, localParameters, null, true); item.setSimulationZip(zip); - if (localParameters.getUseAnalysePlan() && localParameters.isIndependentPlan()) { - // c un plan d'analyse independant, on construit toute les sous simu + if (localParameters.getUseSimulationPlan() && localParameters.isIndependentPlan()) { + // c un plan de simulation independant, on construit toute les sous simu subSimulationComputationExecutor.execute(task); } else { // l'item est fini d'etre initialise, on peut l'ajouter a la queue @@ -423,7 +423,7 @@ SensitivityAnalysis sensitivityAnalysis, DesignPlan designPlan) { // make deep copy, ui, still work with - // copy need to be deep for analyse plan to reload + // copy need to be deep for simulation plan to reload SimulationParameter localParameters = param.deepCopy(); try { @@ -501,9 +501,9 @@ job.setLauncher(launcher); fireStartEvent(job); - if (subParam.getUseAnalysePlan() + if (subParam.getUseSimulationPlan() && subParam.isIndependentPlan()) { - // c un plan d'analyse independant, on construit toute les sous simu + // c un plan de simulation independant, on construit toute les sous simu Runnable task = new PrepareSimulationJob(this, job); subSimulationComputationExecutor.execute(task); } else { @@ -795,7 +795,7 @@ } /** - * Permet de genere les sous simulations d'un plan d'analyse. Pour les + * Permet de genere les sous simulations d'un plan de simulation. Pour les * plan independant, on l'utilise en Runnable pour genere tous les plans * possible et les soumettre a la queue. Pour les plans dependant * on l'utilise seulement comme iterator. La methode afterSimulation des plans @@ -941,7 +941,7 @@ result = false; } else { String simId = id + "_" + planNumber; - param.setAnalysePlanNumber(planNumber); + param.setSimulationPlanNumber(planNumber); File tmpDirectory = FileUtil.createTempDirectory( "isisfish-simulation-", "-preparation"); @@ -949,7 +949,7 @@ .importAndRenameZip(tmpDirectory, job .getItem().getSimulationZip(), simId); - sim.getParameter().setAnalysePlanNumber(planNumber); + sim.getParameter().setSimulationPlanNumber(planNumber); // appel de tous les plans pour modifier la simulation for (SimulationPlan plan : param.getSimulationPlans()) { @@ -1063,7 +1063,7 @@ * <li> exports * <li> simulators * <li> export de la database de la region - * <li> analyseplan + * <li> simultionplan * <p> * Le tout est zippé et le zip est retourné, il peut-être directement * importé dans le {@link SimulationStorage} (en le renommant comme @@ -1076,7 +1076,7 @@ * @param xmlDesignPlan contenu xml des design plan * @param compile si vrai la version compile des fichiers Java est aussi * mise dans le fichier zip. Cela peut servir pour les simulations locales - * pour ne pas recompiler pour chaque simulation avec plan d'analyse + * pour ne pas recompiler pour chaque simulation avec plan de simulation * @return un zip de simulation pour une simulation pret a être faite * @throws SimulationException pour tout problème rencontré (IO,Topia...) */ @@ -1124,7 +1124,7 @@ + File.separator + name + ".java")); } - // copie des regles reclamées par les plans d'analyse + // copie des regles reclamées par les plans de simulation for (String name : param.getExtraRules()) { File ruleFile = new File(RuleStorage.getRuleDirectory(), name + ".java"); if (!ruleFile.isFile()) { @@ -1248,7 +1248,7 @@ fileToConvert.addAll(tmp); tmp = FileUtil.find(new File(directory, - AnalysePlanStorage.ANALYSE_PLAN_PATH), ".*\\.java$", true); + SimulationPlanStorage.SIMULATION_PLAN_PATH), ".*\\.java$", true); fileToConvert.addAll(tmp); tmp = FileUtil.find( Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -78,7 +78,7 @@ /** Columns types. */ protected Class<?>[] columnClass = new Class[] { String.class, // id - String.class, // analyse plan number + String.class, // simulation plan number String.class, // local, remote, batch String.class, // text JProgressBar.class // progress @@ -235,8 +235,8 @@ result = id; break; case 1: - if (param.getUseAnalysePlan()) { - int number = param.getAnalysePlanNumber(); + if (param.getUseSimulationPlan()) { + int number = param.getSimulationPlanNumber(); if (number >= 0) { result = number; } @@ -244,7 +244,7 @@ break; case 2: if (job.getLauncher() == null) { - if (param.getUseAnalysePlan()) { + if (param.getUseSimulationPlan()) { result = _("isisfish.queue.masterplan"); } else { result = _("isisfish.queue.notstarted"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -83,7 +83,7 @@ * * @return le storage contenant la simulation qui vient d'etre faite * ou null en fait au lieu de faire une seul simulation, plusieurs ou ete - * faite par exemple tout un plan d'analyse. Cette classe est tout de meme + * faite par exemple tout un plan de simulation Cette classe est tout de meme * responsable du stockage de chaque simulation dans des storages. * * @throws RemoteException Si pour l'execution de la simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin + * Copyright (C) 1999 - 2011 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 @@ -61,10 +61,10 @@ * Les simulations sont soumises au {@link fr.ifremer.isisfish.simulator.launcher.SimulationService} via sa methode * submit. Un objet {@link fr.ifremer.isisfish.simulator.launcher.SimulationJob} est alors cree et ajoute a la liste * des simulations presentes ({@link fr.ifremer.isisfish.simulator.launcher.SimulationService#getJobs()}). Si la - * simulation est une simple simulation ou une simulation avec plan d'analyse + * simulation est une simple simulation ou une simulation avec plan de simulation * dependant, elle est alors directement ajoutee a la queue de simulation * (simulation a faire). Si - * la simulation utilise un plan d'analyse independant, un thread est + * la simulation utilise un plan de simulation independant, un thread est * specialement utilise pour generer toutes les simulations du plan, celles-ci * sont alors ajoutee a la queue, mais n'apparaitront dans la liste des * simulations qu'au moment ou un thread de simulation executera reellement le Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -56,7 +56,6 @@ * Created: 23 janv. 2006 * * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -41,7 +41,6 @@ * Created: 19 janv. 2006 * * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -41,7 +41,6 @@ * Created: 19 janv. 2006 * * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -41,7 +41,6 @@ * Created: 19 janv. 2006 * * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -41,7 +41,6 @@ * Created: 19 janv. 2006 * * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -64,9 +64,9 @@ public abstract void setEnabledPrescriptTab(boolean selected); /** - * Change analyse plan tab enabled property. + * Change simulation plan tab enabled property. */ - public abstract void setEnabledAnalysePlanTab(boolean selected); + public abstract void setEnabledSimulationPlanTab(boolean selected); /** * Open user dialog to selected a parameter file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -67,7 +67,6 @@ * Created: 9 janv. 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -39,7 +39,6 @@ * Created: 9 janv. 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -38,7 +38,6 @@ * Created: 10 janv. 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -48,7 +48,6 @@ * Created: 10 janv. 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -36,7 +36,6 @@ * Created: 10 janv. 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -1,9 +1,10 @@ /* * #%L + * * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -35,7 +35,7 @@ import fr.ifremer.isisfish.export.Export; /** - * Renderer pour la liste des plans d'analyse. + * Renderer pour la liste des export. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2011 CodeLutin + * Copyright (C) 1999 - 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -43,7 +43,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - /** Analyze plan names. */ + /** Rule names. */ protected List<String> rulesNames; /** @@ -66,7 +66,7 @@ /** * Get rule names. * - * @return the analyze plan names + * @return the rule names */ public List<String> getExportNames() { return rulesNames; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -28,10 +28,8 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.EventObject; import javax.swing.AbstractCellEditor; -import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JTable; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -28,7 +28,6 @@ import java.awt.Component; import javax.swing.JButton; -import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -35,7 +35,7 @@ import fr.ifremer.isisfish.export.SensitivityExport; /** - * Renderer pour la liste des plans d'analyse. + * Renderer pour la liste des export d'AS. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -30,7 +30,7 @@ import javax.swing.DefaultComboBoxModel; /** - * Model pour la liste des plans d'analyse. + * Model pour la liste des plans de simulation. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.ui.util.TooltipHelper; /** - * Renderer pour la combo des plans d'analyse. + * Renderer pour la combo des plans de simulation. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.simulator.SimulationPlan; /** - * Model pour la liste des instances de plans d'analyse. + * Model pour la liste des instances de plans de simulation. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -35,7 +35,7 @@ import fr.ifremer.isisfish.simulator.SimulationPlan; /** - * Renderer pour la liste des plans d'analyse. + * Renderer pour la liste des plans de simulation. * * @author chatellier * @version $Revision$ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 @@ -61,7 +61,6 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.CommonHandler; import fr.ifremer.isisfish.ui.models.common.StringComboModel; -import fr.ifremer.isisfish.ui.models.common.StringListModel; /** * Handler for result UIs. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -65,15 +65,15 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.datastore.SimulationPlanStorage; import fr.ifremer.isisfish.datastore.CodeSourceStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.FormuleStorage; import fr.ifremer.isisfish.datastore.JavaSourceStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; -import fr.ifremer.isisfish.datastore.SensitivityExportStorage; import fr.ifremer.isisfish.datastore.SensitivityAnalysisStorage; +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.datastore.SimulationPlanStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.equation.Language; import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -81,11 +81,10 @@ import fr.ifremer.isisfish.ui.script.model.ScriptTreeModel; import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.vcs.UpdateDialogUI; -import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.CompileHelper; import fr.ifremer.isisfish.util.JavadocHelper; import fr.ifremer.isisfish.vcs.VCSException; -import freemarker.cache.TemplateLoader; +import freemarker.cache.ClassTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; @@ -136,7 +135,7 @@ // fix encoding issue on some systems freemarkerConfiguration.setDefaultEncoding("utf-8"); // specific template loader to get template from jars (classpath) - TemplateLoader templateLoader = new ClasspathTemplateLoader(); + ClassTemplateLoader templateLoader = new ClassTemplateLoader(ScriptAction.class, "/"); freemarkerConfiguration.setTemplateLoader(templateLoader); } @@ -1088,9 +1087,6 @@ /** enum to encapsulate a script module */ protected enum ScriptMapping { - SimulationPlan( - SimulationPlanStorage.getSimulationPlanDirectory(), - SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE, true), Export( ExportStorage.getExportDirectory(), ExportStorage.EXPORT_TEMPLATE, true), @@ -1106,16 +1102,16 @@ SensitivityExport( SensitivityExportStorage.getSensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE, true), + SimulationPlan( + SimulationPlanStorage.getSimulationPlanDirectory(), + SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE, true), Simulator( SimulatorStorage.getSimulatorDirectory(), SimulatorStorage.SIMULATOR_TEMPLATE, true), Formule( FormuleStorage.getFormuleDirectory(), FormuleStorage.FORMULE_TEMPLATE, true), - - CommunityAnalysePlan( - SimulationPlanStorage.getCommunitySimulationPlanDirectory(), - SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE), + CommunityExport( ExportStorage.getCommunityExportDirectory(), ExportStorage.EXPORT_TEMPLATE), @@ -1131,6 +1127,9 @@ CommunitySensitivityExport( SensitivityExportStorage.getCommunitySensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), + CommunityAnalysePlan( + SimulationPlanStorage.getCommunitySimulationPlanDirectory(), + SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE), CommunitySimulator( SimulatorStorage.getCommunitySimulatorDirectory(), SimulatorStorage.SIMULATOR_TEMPLATE), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -53,7 +53,7 @@ onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" /> <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" /> - <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" + <JMenuItem id="miNewSImulationPlan" text="isisfish.script.menu.txtNewSimulationPlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SimulationPlan)' icon="script.png" /> <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 CodeLutin + * Copyright (C) 2005 - 2010 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -61,8 +61,8 @@ } @Override - public void setEnabledAnalysePlanTab(boolean selected) { - // no analyse plan in AS + public void setEnabledSimulationPlanTab(boolean selected) { + // no simulation plan in AS } @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 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 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -143,9 +143,9 @@ getParentContainer(SimulUI.class).getPreScriptUI().getFieldSimulPreScript().setText(preScript); } } -protected void setAnalysePlan() { +protected void setSimulationPlan() { if (!isSensitivity()){ - fieldSimulUseAnalysePlan.setSelected(simulAction.getSimulationParameter().getUseAnalysePlan()); + fieldSimulUseSimulationPlan.setSelected(simulAction.getSimulationParameter().getUseSimulationPlan()); getParentContainer(SimulUI.class).getSensUI().refresh(); } } @@ -200,7 +200,7 @@ // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear())); setPreScript(); - setAnalysePlan(); + setSimulationPlan(); setExportSens(); setSensitivityAnalysis(); setFactor(); @@ -242,10 +242,10 @@ SimulationUI simulationUI = getParentContainer(SimulationUI.class); simulationUI.setEnabledPrescriptTab(fieldUseSimulPreScripts.isSelected()); } -protected void enableAnalysePlan() { - simulAction.getSimulationParameter().setUseAnalysePlan(fieldSimulUseAnalysePlan.isSelected()); +protected void enableSimulationPlan() { + simulAction.getSimulationParameter().setUseSimulationPlan(fieldSimulUseSimulationPlan.isSelected()); SimulationUI simulationUI = getParentContainer(SimulationUI.class); - simulationUI.setEnabledAnalysePlanTab(fieldSimulUseAnalysePlan.isSelected()); + simulationUI.setEnabledSimulationPlanTab(fieldSimulUseSimulationPlan.isSelected()); } protected void setListSimulParamsStrategiesItems() { @@ -525,11 +525,11 @@ onItemStateChanged='enablePreScript()' /> </cell> <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.useAnalysePlan" - id="fieldSimulUseAnalysePlan" - selected='{simulAction.getSimulationParameter().getUseAnalysePlan()}' + <JCheckBox text="isisfish.params.useSimulationPlan" + id="fieldSimulUseSimulationPlan" + selected='{simulAction.getSimulationParameter().getUseSimulationPlan()}' visible='{!isSensitivity()}' - onItemStateChanged='enableAnalysePlan()' + onItemStateChanged='enableSimulationPlan()' enabled="{getRegionStorage() != null}" /> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -88,7 +88,6 @@ 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.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; @@ -262,7 +261,7 @@ * Reset some field to empty default values: * <ul> * <li>params</li> - * <li>analyse plans</li> + * <li>simulation plans</li> * <li>factors list</li> * <ul> * @@ -283,7 +282,7 @@ simulStorage = SimulationStorage.getSimulation(simulName); param = simulStorage.getParameter().copy(); // all time reset number after load - param.setAnalysePlanNumber(-1); + param.setSimulationPlanNumber(-1); regionStorage = param.getRegion(); // Chargement des facteurs @@ -637,11 +636,8 @@ SimulationPlan sp = SimulationPlanStorage.getSimulationPlan(name) .getNewSimulationPlanInstance(); getSimulationParameter().addSimulationPlan(sp); - } catch (IsisFishException e) { - if (log.isErrorEnabled()) { - log.error("Can't add analyse plan", e); - } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.addanalyseplan"), e); + } catch (IsisFishException ex) { + throw new IsisFishRuntimeException("Can't add simulation plan", ex); } } @@ -666,11 +662,8 @@ if (sp != null) { try { result = SimulationPlanStorage.getParameterValue(sp, paramName); - } catch (IsisFishException e) { - if (log.isErrorEnabled()) { - log.error("Can't get analyse plan param value", e); - } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.getparametervalue"), e); + } catch (IsisFishException ex) { + throw new IsisFishRuntimeException("Can't get simulation plan param value", ex); } } return result; @@ -679,16 +672,13 @@ public void setSimulationPlanParameterValue(String paramName, SimulationPlan sp, Object value) { if (log.isDebugEnabled()) { - log.debug("paramName : " + paramName + " analysePlanName : " + sp + log.debug("paramName : " + paramName + " simulationPlanName : " + sp + " value : " + value); } try { SimulationPlanStorage.setParameterValue(sp, paramName, value); - } catch (IsisFishException e) { - if (log.isErrorEnabled()) { - log.error("Can't set analyse plan param value", e); - } - ErrorHelper.showErrorDialog(_("isisfish.error.simulation.setparametervalue"), e); + } catch (IsisFishException ex) { + throw new IsisFishRuntimeException("Can't set simulation plan param value", ex); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -57,7 +57,7 @@ } @Override - public void setEnabledAnalysePlanTab(boolean selected) { + public void setEnabledSimulationPlanTab(boolean selected) { bodyTabbedPane.setEnabledAt(2, selected); if (selected) { bodyTabbedPane.setSelectedIndex(2); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-07-15 13:12:45 UTC (rev 3445) @@ -48,9 +48,9 @@ extractTextFieldParam(SimulationMeta.description.name()); extractTextFieldParam(SimulationMeta.numberOfYear.name()); - extractTextFieldParam(SimulationMeta.analysePlanNumber.name()); + extractTextFieldParam(SimulationMeta.simulationPlanNumber.name()); - extractCheckBoxParam(SimulationMeta.useAnalysePlan.name()); + extractCheckBoxParam(SimulationMeta.useSimulationPlan.name()); extractCheckBoxParam(SimulationMeta.useOptimization.name()); extractCheckBoxParam(SimulationMeta.usePreScript.name()); extractCheckBoxParam(SimulationMeta.useStatistic.name()); @@ -126,10 +126,10 @@ toolTipText='isisfish.filter.simulation.tooltip.numberOfYear'/> <JTextField id="numberOfYear" columns='5' onKeyReleased="doCheck()" /> - <JLabel labelFor='{analysePlanNumber}' - text='isisfish.filter.simulation.analysePlanNumber' - toolTipText='isisfish.filter.simulation.tooltip.analysePlanNumber'/> - <JTextField id="analysePlanNumber" columns='5' + <JLabel labelFor='{simulationPlanNumber}' + text='isisfish.filter.simulation.simulationPlanNumber' + toolTipText='isisfish.filter.simulation.tooltip.simulationPlanNumber'/> + <JTextField id="simulationPlanNumber" columns='5' onKeyReleased="doCheck()" /> </HBox> </cell> @@ -137,9 +137,9 @@ <row> <cell columns="2" anchor='west' weightx="1" fill='horizontal'> <HBox> - <JCheckBox id="useAnalysePlan" - text='isisfish.filter.simulation.useAnalysePlan' - toolTipText='isisfish.filter.simulation.tooltip.useAnalysePlan' + <JCheckBox id="useSimulationPlan" + text='isisfish.filter.simulation.useSimulationPlan' + toolTipText='isisfish.filter.simulation.tooltip.useSimulationPlan' onActionPerformed="doCheck()" /> <JCheckBox id="useOptimization" text='isisfish.filter.simulation.useOptimization' Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -52,7 +52,6 @@ * Created: 23 mars 2004 * * @author Benjamin Poussin <poussin at codelutin.com> - * Copyright Code Lutin * @version $Revision$ * * Mise a jour: $Date$ Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -1,92 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 Ifremer, Code Lutin, 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 - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ -/* *##% - * Copyright (C) 2008, 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.util; - -import java.net.URL; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Resource; -import org.nuiton.util.ResourceNotFoundException; - -import freemarker.cache.URLTemplateLoader; - -/** - * Freemarker custom template loader. - * Load template from classpath jars. - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 1 déc. 2008 $ - * By : $Author: chatellier $ - */ -public class ClasspathTemplateLoader extends URLTemplateLoader { - - /** log */ - private static Log log = LogFactory.getLog(ClasspathTemplateLoader.class); - - /* - * @see freemarker.cache.URLTemplateLoader#getURL(java.lang.String) - */ - @Override - protected URL getURL(String name) { - - if (log.isDebugEnabled()) { - log.debug("Loading url template " + name); - } - - URL url = null; - - try { - url = Resource.getURL(name); - } catch (ResourceNotFoundException e) { - // not big deal - // freemarker ask for name_fr_FR, name_fr, name - url = null; - } - - return url; - } - -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, 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 @@ -22,23 +22,6 @@ * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ -/* *##% - * Copyright (C) 2009 Code Lutin, 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 published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ package fr.ifremer.isisfish.util.ssh; Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-07-15 13:12:45 UTC (rev 3445) @@ -44,7 +44,6 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= -Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -61,7 +60,6 @@ could\ not\ read\ at\ offset\ %1$s\ for\ reason\ %2$s=could not read at offset %1$s for reason %2$s destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= -directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2011.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. @@ -141,8 +139,6 @@ isisfish.config.category.misc.description=Miscealenous isisfish.config.category.officialvcs=Official VCS isisfish.config.category.officialvcs.description=Official VCS repository -isisfish.config.category.versioning= -isisfish.config.category.versioning.description= isisfish.config.database.lockmode.description=Database lock mode isisfish.config.main.compileDirectory.description=Script compilation directory isisfish.config.main.configFileName.description=Configuration filename @@ -202,12 +198,9 @@ isisfish.config.vcs.hostName.description=Official VCS host name isisfish.config.vcs.localCommunityDatabasePath.description=Community VCS local storage directory isisfish.config.vcs.localDatabasePath.description=Official VCS local storage directory -isisfish.config.vcs.noPassPhrase.description= -isisfish.config.vcs.passphrase.description= isisfish.config.vcs.protocol.description=Official VCS protocol isisfish.config.vcs.remotePath.description=Official VCS remote path isisfish.config.vcs.type.description=Official VCS type -isisfish.config.vcs.useSshConnexion.description= isisfish.config.vcs.userName.description=Official VCS user name isisfish.config.vcs.userPassword.description=Official VCS password isisfish.date.toString=%1$s %2$s @@ -267,7 +260,6 @@ isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.invalid= isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative @@ -310,21 +302,16 @@ isisfish.error.no.sector=No sector defined isisfish.error.no.select.simulation=Could not select simulation isisfish.error.no.target.species=No target species in %1$s for %2$s -isisfish.error.not.found.code=Could not found codeclass for %1$s isisfish.error.not.found.description=Could not found description for %1$s isisfish.error.not.found.field=Could not found field %1$s doc for %2$s -isisfish.error.not.found.field.class=Could not found field %1$s for class %2$s -isisfish.error.not.null.class.grown=Null value for grown class isisfish.error.not.null.mean.weight=Null mean weight isisfish.error.not.possible.metier=No metier available -isisfish.error.not.support.class=this class does not support isisfish.error.null.semantics=Null semantics for %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s isisfish.error.parse.long=Can't parse long %1$s -isisfish.error.plan.parameter=Can't get plan parameter from compiled class isisfish.error.prepare.data=Can't prepare data isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s @@ -341,14 +328,11 @@ isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s -isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=Can't delete file %1$s for reason %2$s isisfish.error.script.import=Can't import file for reason %1$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s -isisfish.error.simulation.addanalyseplan=Can't add analyze plan -isisfish.error.simulation.getparametervalue=Can't get parameter value isisfish.error.simulation.getresultname=Can't get result names list isisfish.error.simulation.importparameter=Can't import simulation parameters isisfish.error.simulation.initsimulaction=Can't init simulation @@ -363,7 +347,6 @@ isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s isisfish.error.simulation.savesimulation=Can't save simulation parameters -isisfish.error.simulation.setparametervalue=Can't set parameter value isisfish.error.source.parameter=Can't get parameter from source isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them isisfish.error.undefined.classes=No classes defined @@ -405,31 +388,31 @@ isisfish.filter.select=Select isisfish.filter.select.simulation=Select a simulation isisfish.filter.simulation=Filter simulations -isisfish.filter.simulation.analysePlanNumber=Analyse plan number isisfish.filter.simulation.description=Description isisfish.filter.simulation.local=Local isisfish.filter.simulation.numberOfYear=Number of year isisfish.filter.simulation.regionName=Region name isisfish.filter.simulation.simulationEnd=Simulation end date (dd/MM/yyyy) isisfish.filter.simulation.simulationName=Simulation name +isisfish.filter.simulation.simulationPlanNumber=Simulation plan number isisfish.filter.simulation.simulationStart=Simulation start date (dd/MM/yyyy) isisfish.filter.simulation.simulatorName=Simulator name -isisfish.filter.simulation.tooltip.analysePlanNumber=Filter on analyse number isisfish.filter.simulation.tooltip.description=Filter on description (regex) isisfish.filter.simulation.tooltip.local=Filter only local simulations isisfish.filter.simulation.tooltip.numberOfYear=Filter on number of year (exact sequence) isisfish.filter.simulation.tooltip.regionName=Filter on region name (regex) isisfish.filter.simulation.tooltip.simulationEnd=Filter on region end date (format dd/MM/yyyy) isisfish.filter.simulation.tooltip.simulationName=Filter on simulation name +isisfish.filter.simulation.tooltip.simulationPlanNumber=Filter on simulation number isisfish.filter.simulation.tooltip.simulationStart=Filter on simulation start date (format dd/MM/yyyy) isisfish.filter.simulation.tooltip.simulatorName=Filter on simulator name -isisfish.filter.simulation.tooltip.useAnalysePlan=Filter on simulations with analyse plan isisfish.filter.simulation.tooltip.useOptimization=Filter on simulations with optimization isisfish.filter.simulation.tooltip.usePreScript=Filter on simulations with pre-script +isisfish.filter.simulation.tooltip.useSimulationPlan= isisfish.filter.simulation.tooltip.useStatistic=Filter on simulations with statistic -isisfish.filter.simulation.useAnalysePlan=analyse plan isisfish.filter.simulation.useOptimization=optimization isisfish.filter.simulation.usePreScript=pre-script +isisfish.filter.simulation.useSimulationPlan=Simulation plan isisfish.filter.simulation.useStatistic=statistic isisfish.fisheryRegion.addMap=Add map isisfish.fisheryRegion.area=Fishery area boundaries @@ -616,7 +599,6 @@ isisfish.metierSeasonInfoZone.title=Seasons / Zones isisfish.misc.databasemigration.question=Database version is \: %s.\n\nA migration to version %s is needed.\nDo you want to migrate database ? isisfish.misc.databasemigration.title=Database migration -isisfish.misc.nuitonmigration=IsisFish has detected some code based on CodeLutin libraries in following user scripts.\nDo you want to migrate those script on new nuiton libraries ? isisfish.month.april=april isisfish.month.august=august isisfish.month.december=december @@ -649,7 +631,7 @@ isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s isisfish.params.toString.number.years=Number of years\: %1$s\n\n isisfish.params.toString.plan=Plan\: %1$s -isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n +isisfish.params.toString.plan.number=Simulation plan sequence number\: %1$s\n\n isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Rule\: %1$s isisfish.params.toString.script.logger.level=Level of scripts' logger \: %1$s @@ -657,8 +639,8 @@ isisfish.params.toString.simul.logger.level=Level of simulator's logger \: %1$s isisfish.params.toString.simulation.done=Simulation done with \: %1$s isisfish.params.toString.strategies=Strategies \: -isisfish.params.useAnalysePlan=Use simulation plan isisfish.params.usePreSimulationScript=Use pre simulation script +isisfish.params.useSimulationPlan=Use simulation plan isisfish.population.capturability=Capturability isisfish.population.comments=Comments isisfish.population.group=Group @@ -674,7 +656,6 @@ isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth -isisfish.populationBasics.maturityGroup=Maturity group isisfish.populationBasics.name=Name isisfish.populationBasics.numberGroup=Number of group isisfish.populationBasics.plusGroup=Plus group @@ -828,13 +809,13 @@ isisfish.script.menu.save=Save isisfish.script.menu.txtExport=Export isisfish.script.menu.txtImport=Import -isisfish.script.menu.txtNewAnalysePlan=New analyse plan isisfish.script.menu.txtNewEquationModel=New equation model isisfish.script.menu.txtNewExport=New export isisfish.script.menu.txtNewRule=New rule isisfish.script.menu.txtNewScript=New script isisfish.script.menu.txtNewSensitivity=New sensitivity calculator isisfish.script.menu.txtNewSensitivityExport=New sensitivity export +isisfish.script.menu.txtNewSimulationPlan=New simulation plan isisfish.script.menu.txtNewSimulator=New simulator isisfish.script.menu.txtVCS=Server isisfish.script.menu.update=Update from server Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-07-15 13:12:45 UTC (rev 3445) @@ -44,7 +44,6 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= -Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -61,7 +60,6 @@ could\ not\ read\ at\ offset\ %1$s\ for\ reason\ %2$s=could not read at offset %1$s for reason %2$s destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= -directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2011.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec Isis-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. @@ -141,8 +139,6 @@ isisfish.config.category.misc.description=Divers isisfish.config.category.officialvcs=VCS Officiel isisfish.config.category.officialvcs.description=Dépôt contenant les scripts officiels -isisfish.config.category.versioning= -isisfish.config.category.versioning.description= isisfish.config.database.lockmode.description=Méthode de vérouillage à utiliser pour la base de données isisfish.config.main.compileDirectory.description=le répertoire où sont compilés les scripts isisfish.config.main.configFileName.description=le fichier de configuration à utiliser @@ -172,7 +168,7 @@ isisfish.config.main.simulation.ssh.javapath=Emplacement de java isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de caparmor) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH -isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultanée à faire en SSH. Attention, ne doit être utilisé que pour faire plusieurs plans d'analyse dépendants en même temps, sinon laisser '1'. +isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultanée à faire en SSH. Attention, ne doit être utilisé que pour faire plusieurs plans de simulation dépendants en même temps, sinon laisser '1'. isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur isisfish.config.main.simulation.ssh.pbsqsuboptions=Arguments qsub @@ -202,12 +198,9 @@ isisfish.config.vcs.hostName.description=le nom du serveur vcs à utiliser isisfish.config.vcs.localCommunityDatabasePath.description=Dossier de stockage local du dépôt communauté isisfish.config.vcs.localDatabasePath.description=Dossier de stockage local du dépôt officiel -isisfish.config.vcs.noPassPhrase.description= -isisfish.config.vcs.passphrase.description= isisfish.config.vcs.protocol.description=le protocol pour acceder au serveur vcs isisfish.config.vcs.remotePath.description=le chemin jusqu'au parent du module de données sur le serveur vcs isisfish.config.vcs.type.description=le type de communication vcs utilisé -isisfish.config.vcs.useSshConnexion.description= isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs isisfish.config.vcs.userPassword.description=le mot de passe de l'utilsateur sur le serveur vcs isisfish.date.toString=%1$s %2$s @@ -267,7 +260,6 @@ isisfish.error.evaluate.equation=Impossible d'évaluer l'équation\: %1$s isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.invalid= isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative @@ -310,21 +302,16 @@ isisfish.error.no.sector=il n'y a pas de secteur de définit isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s -isisfish.error.not.found.field.class=could not found field %1$s for class %2$s -isisfish.error.not.null.class.grown=classe mature vaut nul isisfish.error.not.null.mean.weight=poids moyen nul isisfish.error.not.possible.metier=Pas de métier possible -isisfish.error.not.support.class=La classe %s ne supporte pas les descritions isisfish.error.null.semantics=Semantiques nulle pour %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s isisfish.error.parse.long=Can't parse long %1$s -isisfish.error.plan.parameter=Can't get plan parameter from compiled class isisfish.error.prepare.data=Can't prepare data isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s @@ -341,14 +328,11 @@ isisfish.error.rename.region=Can't rename region to %1$s isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s -isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s -isisfish.error.simulation.addanalyseplan=Impossible d'ajouter un plan d'analyze -isisfish.error.simulation.getparametervalue=Impossible d'obtenir la valeur du paramètre isisfish.error.simulation.getresultname=Impossible d'obtenir la liste des résultat isisfish.error.simulation.importparameter=Impossible d'importer les paramètres de simulation isisfish.error.simulation.initsimulaction=Impossible d'initialiser la simulation @@ -363,7 +347,6 @@ isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s isisfish.error.simulation.savesimulation=Impossible de sauver les paramètres de simulation -isisfish.error.simulation.setparametervalue=Impossible d'affecter la valeur du paramètre isisfish.error.source.parameter=Can't get parameter from source isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them isisfish.error.undefined.classes=pas de classes définies @@ -405,31 +388,31 @@ isisfish.filter.select=Sélectionner isisfish.filter.select.simulation=Sélectionner une simulation isisfish.filter.simulation=Filtrer les simulations -isisfish.filter.simulation.analysePlanNumber=numéro d'analyse isisfish.filter.simulation.description=description isisfish.filter.simulation.local=locale isisfish.filter.simulation.numberOfYear=nombre d'année(s) isisfish.filter.simulation.regionName=nom de région isisfish.filter.simulation.simulationEnd=date de fin (dd/MM/yyyy) isisfish.filter.simulation.simulationName=nom de simulation +isisfish.filter.simulation.simulationPlanNumber=Numéro de simulation isisfish.filter.simulation.simulationStart=date de début (dd/MM/yyyy) isisfish.filter.simulation.simulatorName=nom du simulateur -isisfish.filter.simulation.tooltip.analysePlanNumber=filter sur le numéro d'analyse (uniquement pour les simulations avec plan d'analyse) isisfish.filter.simulation.tooltip.description=filtrer sur la description (format regex) isisfish.filter.simulation.tooltip.local=filter uniquement les simulations locales isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'année(s) (recherche exacte) isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la région (format regex) isisfish.filter.simulation.tooltip.simulationEnd=filtrer sur la date de fin de simulation (format dd/MM/yyyy) isisfish.filter.simulation.tooltip.simulationName=filtrer sur le nom de simulation (format regex) +isisfish.filter.simulation.tooltip.simulationPlanNumber=Filtrer si le numéro de simulation (dans un plan) isisfish.filter.simulation.tooltip.simulationStart=filtrer sur la date de début de simulation (format dd/MM/yyyy) isisfish.filter.simulation.tooltip.simulatorName=filter sur le nom du simulateur utilisé (format regex) -isisfish.filter.simulation.tooltip.useAnalysePlan=filter uniquement les simulations avec plan d'analyse isisfish.filter.simulation.tooltip.useOptimization=filter uniquement les simulations avec optimisation isisfish.filter.simulation.tooltip.usePreScript=filter uniquement les simulations avec Prescript +isisfish.filter.simulation.tooltip.useSimulationPlan=filtrer sur les simulations utilisant un plan de simulation isisfish.filter.simulation.tooltip.useStatistic=filter uniquement les simulations avec statistiques -isisfish.filter.simulation.useAnalysePlan=plan d'analyse isisfish.filter.simulation.useOptimization=optimisation isisfish.filter.simulation.usePreScript=prescript +isisfish.filter.simulation.useSimulationPlan=plan de simulation isisfish.filter.simulation.useStatistic=statistiques isisfish.fisheryRegion.addMap=Ajouter une carte isisfish.fisheryRegion.area=Extrémités de la zone de pêche @@ -616,7 +599,6 @@ isisfish.metierSeasonInfoZone.title=Saison / Zones isisfish.misc.databasemigration.question=La base de donnée est en version \: %s.\n\nUne migration en version %s est nécessaire.\nVoulez vous migrer la base de données ? isisfish.misc.databasemigration.title=Migration de base de données -isisfish.misc.nuitonmigration=IsisFish a détecté l'utilisation de librairies CodeLutin dans les scripts suivants.\nVoulez vous migrer ces scripts vers les nouvelles librairies nuiton ? isisfish.month.april=avril isisfish.month.august=août isisfish.month.december=décembre @@ -657,8 +639,8 @@ isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s isisfish.params.toString.simulation.done=Simulation réalisée avec \: %1$s isisfish.params.toString.strategies=Stratégies d'exploitation \: -isisfish.params.useAnalysePlan=Utiliser le plan de simulation isisfish.params.usePreSimulationScript=Utiliser un script de pré-simulation +isisfish.params.useSimulationPlan=Utiliser un plan de simulation isisfish.population.capturability=Capturabilité isisfish.population.comments=Commentaires isisfish.population.group=Groupe @@ -674,7 +656,6 @@ isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse -isisfish.populationBasics.maturityGroup=Groupe de maturité isisfish.populationBasics.name=Nom isisfish.populationBasics.numberGroup=Nombre de groupes isisfish.populationBasics.plusGroup=Groupe plus @@ -828,13 +809,13 @@ isisfish.script.menu.save=Sauver isisfish.script.menu.txtExport=Exporter isisfish.script.menu.txtImport=Importer -isisfish.script.menu.txtNewAnalysePlan=Nouveau plan d'analyse isisfish.script.menu.txtNewEquationModel=Nouvelle formule isisfish.script.menu.txtNewExport=Nouveau script d'export isisfish.script.menu.txtNewRule=Nouvelle règle isisfish.script.menu.txtNewScript=Nouveau script isisfish.script.menu.txtNewSensitivity=Nouveau calculateur de sensibilité isisfish.script.menu.txtNewSensitivityExport=Nouvel export de sensibilité +isisfish.script.menu.txtNewSimulationPlan=Nouveau plan de simulation isisfish.script.menu.txtNewSimulator=Nouveau simulateur isisfish.script.menu.txtVCS=Serveur isisfish.script.menu.update=Synchronisation Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/main/resources/log4j.properties 2011-07-15 13:12:45 UTC (rev 3445) @@ -24,6 +24,7 @@ ### # Global logging configuration log4j.rootLogger=ERROR, stdout + # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout @@ -33,11 +34,11 @@ log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.org.nuiton=WARN -log4j.logger.analyseplans=INFO log4j.logger.exports=INFO log4j.logger.formules=INFO log4j.logger.rules=INFO log4j.logger.scripts=INFO -log4j.logger.sensitivity=INFO +log4j.logger.sensitivityanalysis=INFO log4j.logger.sensitivityexports=INFO +log4j.logger.simulationplans=INFO log4j.logger.simulators=INFO Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -34,8 +34,7 @@ import org.junit.BeforeClass; import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; -import fr.ifremer.isisfish.util.ClasspathTemplateLoader; -import freemarker.cache.TemplateLoader; +import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; @@ -148,7 +147,7 @@ freemarkerConfiguration.setDefaultEncoding("utf-8"); // specific template loader to get template from jars (classpath) - TemplateLoader templateLoader = new ClasspathTemplateLoader(); + ClassTemplateLoader templateLoader = new ClassTemplateLoader(AbstractIsisFishTest.class, "/"); freemarkerConfiguration.setTemplateLoader(templateLoader); freemarkerConfiguration.setObjectWrapper(new BeansWrapper()); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2011-07-15 13:12:45 UTC (rev 3445) @@ -77,8 +77,8 @@ Assert.assertTrue(params.getExportNames().isEmpty()); Assert.assertFalse(params.getUsePreScript()); Assert.assertEquals("", params.getPreScript()); - Assert.assertFalse(params.getUseAnalysePlan()); - Assert.assertEquals(-1, params.getAnalysePlanNumber()); + Assert.assertFalse(params.getUseSimulationPlan()); + Assert.assertEquals(-1, params.getSimulationPlanNumber()); Assert.assertTrue(params.getSensitivityExport().isEmpty()); Assert.assertEquals(-1, params.getNumberOfSensitivitySimulation()); Assert.assertNull(params.getSensitivityAnalysis()); @@ -201,13 +201,13 @@ SimulationParameterImpl param2 = new SimulationParameterImpl(); param2.fromProperties(props2); - // test analyse plans + // test simulation plans Assert.assertNull(param.simulationPlans); Assert.assertTrue(param2.propertiesParameters.containsKey("plans")); // ca rend zero parce que l'instanciation doit echouer Assert.assertEquals(0, param2.getSimulationPlans().size()); } - + /** * Test toString() method. * Modified: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2011-07-15 13:12:45 UTC (rev 3445) @@ -39,7 +39,7 @@ useOptimization=true useStatistic=false exportDirectory=/home/chatellier/isis-export -useAnalysePlan=false +useSimulationPlan=false isisFishVersion=3.2.0.6 rule.1.parameter.endMonth=10 rule.1.parameter.endDate=118 @@ -47,12 +47,12 @@ rule.1.parameter.beginDate=1 populations=Anchois_long description=Done for unit testing -analysePlan= +simulationPlan= rule.1.parameter.beginMonth=1 population.Anchois_long.number=[[10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 2000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0]] plans= simulatorName=DefaultSimulator.java strategies=Espagnols,BolBretons,PelProfil1 -analysePlanNumber=-1 +simulationPlanNumber=-1 exports=EffortsMetier.java, resultNames=matrixGrossValueOfLandingsPerStrategyMet, Modified: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2011-07-11 11:22:25 UTC (rev 3444) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2011-07-15 13:12:45 UTC (rev 3445) @@ -39,7 +39,7 @@ useOptimization=true useStatistic=false exportDirectory=/home/chatellier/isis-export -useAnalysePlan=true +useSimulationPlan=true isisFishVersion=3.2.0.6 rule.1.parameter.endMonth=11 rule.1.parameter.endDate=119 @@ -47,12 +47,12 @@ rule.1.parameter.beginDate=0 populations=Anchois_long description=Done for unit testing (plan) -analysePlan=TestCapturabiliteUnavailable +simulationPlan=TestCapturabiliteUnavailable rule.1.parameter.beginMonth=0 population.Anchois_long.number=[[10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 5000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 2000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0], [10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0, 10000.0]] plans=TestCapturabiliteUnavailable simulatorName=DefaultSimulator.java strategies=Espagnols,BolBretons,PelProfil1 -analysePlanNumber=-1 +simulationPlanNumber=-1 exports=EffortsMetier.java, resultNames=matrixGrossValueOfLandingsPerStrategyMet,