[Isis-fish-commits] r4072 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export simulator ui/simulator

29 Jul 2014

Author: bpoussin
Date: 2014-07-29 13:25:57 +0200 (Tue, 29 Jul 2014)
New Revision: 4072

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4072

Log:
(continuation) replace string with constante


Modified:
   trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java
   trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java
   trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
   trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java

Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java
===================================================================

--- trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java	2014-07-29 10:03:58 UTC (rev 4071)
+++ trunk/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java	2014-07-29 11:25:57 UTC (rev 4072)
@@ -35,6 +35,9 @@
 import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.util.ConverterUtil;
 
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.DOT;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETER_KEY;
+
 /**
  * Helper used to populate and extract instance parameters
  * from simulation.
@@ -65,7 +68,7 @@
         //ConvertUtilsBean beanUtils = ConverterUtil.getConverter(region
         //        .getStorage());
         String exportName = JavaSourceStorage.getName(instance);
-        String paramTag = propPrefix + "." + instanceIndex + ".parameter.";
+        String paramTag = propPrefix + "." + instanceIndex + DOT + PARAMETER_KEY + DOT;
 
         for (Map.Entry<String, Class<?>> entry : JavaSourceStorage.getParameterNames(instance).entrySet()) {
             String propName = entry.getKey();
@@ -120,7 +123,8 @@
                 Object value = RuleStorage.getParameterValue(instance, paramName);
                 paramValueString = beanUtils.convert(value);
                 if (paramValueString != null) {
-                    result.setProperty(propPrefix + "." + instanceIndex + ".parameter." + paramName, paramValueString);
+                    result.setProperty(propPrefix + DOT + instanceIndex
+                             + DOT + PARAMETER_KEY + DOT + paramName, paramValueString);
                 }
             } catch (IsisFishException eee) {
                 if (log.isWarnEnabled()) {

Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java	2014-07-29 10:03:58 UTC (rev 4071)
+++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java	2014-07-29 11:25:57 UTC (rev 4072)
@@ -40,6 +40,7 @@
 import fr.ifremer.isisfish.datastore.ExportStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.datastore.StorageHelper;
+import fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper;
 
 /**
  * Helper for exports manipulation.
@@ -131,7 +132,8 @@
      */
     public static void populateSensitivityExport(int exportIndex, TopiaContext context,
             SensitivityExport export, Properties props) {
-        populateStorageParams(exportIndex, context, export, props, "sensitivityexport");
+        populateStorageParams(exportIndex, context, export, props,
+                SimulationParameterPropertiesHelper.SENSITIVITY_EXPORT_KEY);
     }
     
     /**
@@ -146,6 +148,7 @@
      */
     public static Properties getSensitivityExportAsProperties(
             int sensitivityExportIndex, TopiaContext context, SensitivityExport sensitivityExport) {
-        return getParamsAsProperties(sensitivityExportIndex, context, sensitivityExport, "sensitivityexport");
+        return getParamsAsProperties(sensitivityExportIndex, context, sensitivityExport,
+                SimulationParameterPropertiesHelper.SENSITIVITY_EXPORT_KEY);
     }
 }

Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java	2014-07-29 10:03:58 UTC (rev 4071)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java	2014-07-29 11:25:57 UTC (rev 4072)
@@ -81,6 +81,7 @@
 import static org.nuiton.i18n.I18n.n;
 
 import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.DOT;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.LIST_SEPARATOR;
 
 /**
  * Real {@link SimulationParameter} implementation.
@@ -240,7 +241,7 @@
         // if not already set
         if (isisFishVersion == null) {
             if (propertiesParameters != null) {
-                isisFishVersion = propertiesParameters.getProperty("isisFishVersion", "");
+                isisFishVersion = SimulationParameterPropertiesHelper.getIsisFishVersion(propertiesParameters);
             } else {
                 // default value
                 isisFishVersion = IsisConfig.getVersion();
@@ -265,7 +266,8 @@
 
         if (description == null) {
             if (propertiesParameters != null) {
-                description = propertiesParameters.getProperty("description", "");
+                description = SimulationParameterPropertiesHelper
+                        .getDescription(propertiesParameters);
             } else {
                 // default value
                 description = "";
@@ -385,8 +387,7 @@
                                 Population population = populationDAO.findByName(name);
                                 populations.add(population);
 
-                                String numberAsString = propertiesParameters.getProperty("population." + name + ".number");
-                                List number = MatrixHelper.convertStringToList(numberAsString);
+                                List number = SimulationParameterPropertiesHelper.getPopulationNumbers(propertiesParameters, name);
                                 MatrixND mat = getNumberOf(population);
                                 mat.fromList(number);
                             } catch (TopiaException eee) {
@@ -455,7 +456,7 @@
                     String[] strategyList = SimulationParameterPropertiesHelper
                             .getStrategieNames(propertiesParameters);
                     for (String name : strategyList) {
-                        if (name != null && !"".equals(name)) {
+                        if (StringUtils.isNotEmpty(name)) {
                             try {
                                 Strategy str = strategyDAO.findByName(name);
                                 strategies.add(str);
@@ -521,17 +522,18 @@
 
             if (propertiesParameters != null) {
                 // simulation plan
-                String[] planList = propertiesParameters.getProperty("plans",
-                        "").split(",");
+                String[] planList = SimulationParameterPropertiesHelper
+                        .getSimulationPlanNames(propertiesParameters);
                 int planIndex = 0;
                 for (String name : planList) {
-                    if (name != null && !"".equals(name)) {
+                    if (StringUtils.isNotEmpty(name)) {
                         try {
                             SimulationPlanStorage planStorage = SimulationPlanStorage.getSimulationPlan(name);
                             if (planStorage != null) { // since 4.0.0.3 can return null
                                 SimulationPlan plan = planStorage.getNewInstance();
                                 StorageHelper.populateStorageParams(planIndex++,
-                                        getRegion().getStorage(), plan, propertiesParameters, "plan");
+                                        getRegion().getStorage(), plan, propertiesParameters,
+                                        SimulationParameterPropertiesHelper.PLAN_KEY);
                                 simulationPlans.add(plan);
                             }
                         } catch (Exception eee) {
@@ -626,7 +628,7 @@
                             .getRuleNames(propertiesParameters);
                     int ruleIndex = 0;
                     for (String name : ruleList) {
-                        if (name != null && !"".equals(name)) {
+                        if (StringUtils.isNotEmpty(name)) {
                             try {
                                 Rule rule = RuleStorage.getRule(name).getNewInstance();
                                 RuleHelper.populateRule(ruleIndex++, tx, rule, propertiesParameters);
@@ -683,9 +685,11 @@
                 // en version < 4.3, le parametre était nommé 'useOptimization'
                 // qualifiait le cache, il été renommé ensuite
                 if (VersionUtil.smallerThan(getIsisFishVersion(), "4.3.0.0")) {
-                    useCache = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "true"));
+                    useCache = Boolean.valueOf(propertiesParameters.getProperty(
+                            SimulationParameterPropertiesHelper.USE_OPTIMIZATION_KEY, "true"));
                 } else {
-                    useCache = Boolean.valueOf(propertiesParameters.getProperty("useCache", "true"));
+                    useCache = Boolean.valueOf(propertiesParameters.getProperty(
+                            SimulationParameterPropertiesHelper.USE_CACHE_KEY, "true"));
                 }
             } else {
                 useCache = Boolean.TRUE;
@@ -707,7 +711,7 @@
 
         if (useStatistic == null) {
             if (propertiesParameters != null) {
-                useStatistic = Boolean.valueOf(propertiesParameters.getProperty("useStatistic", "false"));
+                useStatistic = SimulationParameterPropertiesHelper.getUseStatistic(propertiesParameters);
             } else {
                 useStatistic = Boolean.FALSE;
             }
@@ -735,7 +739,7 @@
                 // exports
                 String[] exportList = SimulationParameterPropertiesHelper.getExportNames(propertiesParameters);
                 for (String name : exportList) {
-                    if (name != null && !"".equals(name)) {
+                    if (StringUtils.isNotEmpty(name)) {
                         exportNames.add(name);
                     }
                 }
@@ -788,15 +792,16 @@
 
         if (sensitivityAnalysis == null) {
             if (propertiesParameters != null) {
-                String analysisName = propertiesParameters
-                        .getProperty("sensitivityanalysis");
-                if (!StringUtils.isEmpty(analysisName)) {
+                String analysisName = SimulationParameterPropertiesHelper
+                        .getSensitivityAnalysis(propertiesParameters);
+                if (StringUtils.isNotEmpty(analysisName)) {
                     try {
                         SensitivityAnalysisStorage sensitivityStorage = SensitivityAnalysisStorage.getSensitivityAnalysis(analysisName);
                         sensitivityAnalysis = sensitivityStorage.getNewInstance();
                         // 0 = only single sensitivity
-                        StorageHelper.populateStorageParams(0, getRegion().getStorage(), sensitivityAnalysis,
-                                propertiesParameters, "sensitivity");
+                        StorageHelper.populateStorageParams(0, getRegion().getStorage(),
+                                sensitivityAnalysis, propertiesParameters,
+                                SimulationParameterPropertiesHelper.SENSITIVITY_KEY);
                     } catch (Exception eee) {
                         sensitivityAnalysis = null;
                         if (log.isWarnEnabled()) {
@@ -842,8 +847,8 @@
                     }
 
                     // sensitivity export
-                    String[] sensitivityExportList = propertiesParameters
-                            .getProperty("sensitivityexports", "").split(",");
+                    String[] sensitivityExportList = SimulationParameterPropertiesHelper
+                            .getSensitivityExportNames(propertiesParameters);
                     int sensitivityExportIndex = 0;
                     for (String name : sensitivityExportList) {
                         try {
@@ -895,14 +900,17 @@
     public Optimization getOptimization() {
         if (optimization == null) {
             if (propertiesParameters != null) {
-                String optimizationName = propertiesParameters.getProperty("optimization");
+                String optimizationName = SimulationParameterPropertiesHelper
+                        .getOptimizationName(propertiesParameters);
                 if (!StringUtils.isEmpty(optimizationName)) {
                     try {
-                        OptimizationStorage optimizationStorage = OptimizationStorage.getOptimization(optimizationName);
+                        OptimizationStorage optimizationStorage =
+                                OptimizationStorage.getOptimization(optimizationName);
                         optimization = optimizationStorage.getNewInstance();
                         // 0 = only single optimization
-                        StorageHelper.populateStorageParams(0, getRegion().getStorage(), optimization,
-                                propertiesParameters, "optimization");
+                        StorageHelper.populateStorageParams(0, getRegion().getStorage(),
+                                optimization, propertiesParameters,
+                                SimulationParameterPropertiesHelper.OPTIMIZATION_KEY);
                     } catch (Exception eee) {
                         optimization = null;
                         if (log.isWarnEnabled()) {
@@ -925,7 +933,8 @@
                 if (VersionUtil.smallerThan(getIsisFishVersion(), "4.3.0.0")) {
                     useOptimization = Boolean.FALSE;
                 } else {
-                    useOptimization = SimulationParameterPropertiesHelper.getUseOptimization(propertiesParameters);
+                    useOptimization = Boolean.valueOf(propertiesParameters.getProperty(
+                            SimulationParameterPropertiesHelper.USE_OPTIMIZATION_KEY, "false"));
                 }
             } else {
                 useOptimization = Boolean.FALSE;
@@ -948,14 +957,17 @@
     public Objective getObjective() {
         if (objective == null) {
             if (propertiesParameters != null) {
-                String objectiveName = propertiesParameters.getProperty("objective");
+                String objectiveName = SimulationParameterPropertiesHelper
+                        .getObjectiveName(propertiesParameters);
                 if (!StringUtils.isEmpty(objectiveName)) {
                     try {
-                        ObjectiveStorage objectiveStorage = ObjectiveStorage.getObjective(objectiveName);
+                        ObjectiveStorage objectiveStorage =
+                                ObjectiveStorage.getObjective(objectiveName);
                         objective = objectiveStorage.getNewInstance();
                         // 0 = only single objective
-                        StorageHelper.populateStorageParams(0, getRegion().getStorage(), objective,
-                                propertiesParameters, "objective");
+                        StorageHelper.populateStorageParams(0, getRegion().getStorage(),
+                                objective, propertiesParameters,
+                                SimulationParameterPropertiesHelper.OBJECTIVE_KEY);
                     } catch (Exception eee) {
                         objective = null;
                         if (log.isWarnEnabled()) {
@@ -994,15 +1006,19 @@
                     }
 
                     // rules
-                    String[] optimizationExportList = propertiesParameters.getProperty("optimizationexports", "").split(",");
+                    String[] optimizationExportList = SimulationParameterPropertiesHelper
+                            .getOptimizationExportNames(propertiesParameters);
                     ConvertUtilsBean beanUtils = ConverterUtil.getConverter(tx);
                     int optimizationExportIndex = 0;
                     for (String name : optimizationExportList) {
-                        if (name != null && !"".equals(name)) {
+                        if (StringUtils.isNotBlank(name)) {
                             try {
                                 Export export = ExportStorage.getExport(name).getNewInstance();
                                 Observation observation = null;
-                                String observationId = propertiesParameters.getProperty("optimizationobservation." + optimizationExportIndex);
+                                String observationId = propertiesParameters.getProperty(
+                                        SimulationParameterPropertiesHelper.
+                                                OPTIMIZATION_OBSERVATION_KEY
+                                                + DOT + optimizationExportIndex);
                                 if (StringUtils.isNotBlank(observationId)) {
                                     observation = (Observation)beanUtils.convert(observationId, TopiaEntity.class);
                                 }
@@ -1116,7 +1132,8 @@
         if (numberOfYear == null) {
 
             if (propertiesParameters != null) {
-                numberOfYear = Integer.valueOf(propertiesParameters.getProperty("numberOfYear", "1"));
+                numberOfYear = SimulationParameterPropertiesHelper
+                        .getNumberOfYear(propertiesParameters);
             } else {
                 numberOfYear = 1;
             }
@@ -1190,7 +1207,8 @@
         if (generatedPreScript == null) {
 
             if (propertiesParameters != null) {
-                generatedPreScript = SimulationParameterPropertiesHelper.getGeneratedPreScript(propertiesParameters);
+                generatedPreScript = SimulationParameterPropertiesHelper
+                        .getGeneratedPreScript(propertiesParameters);
             } else {
                 generatedPreScript = "";
             }
@@ -1212,7 +1230,8 @@
 
         if (regionName == null) {
             if (propertiesParameters != null) {
-                regionName = propertiesParameters.getProperty("regionName", "");
+                regionName = SimulationParameterPropertiesHelper
+                        .getRegionName(propertiesParameters);
             } else {
                 // defaut value
                 regionName = "";
@@ -1238,8 +1257,8 @@
 
         if (simulatorName == null) {
             if (propertiesParameters != null) {
-                simulatorName = propertiesParameters.getProperty(
-                        "simulatorName", "DefaultSimulator.java");
+                simulatorName = SimulationParameterPropertiesHelper
+                        .getSimulatorName(propertiesParameters);
             } else {
                 simulatorName = "DefaultSimulator.java";
             }
@@ -1316,7 +1335,8 @@
         if (simulLogLevel == null) {
 
             if (propertiesParameters != null) {
-                simulLogLevel = SimulationParameterPropertiesHelper.getSimulLogLevel(propertiesParameters);
+                simulLogLevel = SimulationParameterPropertiesHelper
+                        .getSimulLogLevel(propertiesParameters);
             } else {
                 simulLogLevel = "info";
             }
@@ -1345,7 +1365,8 @@
 
         if (scriptLogLevel == null) {
             if (propertiesParameters != null) {
-                scriptLogLevel = SimulationParameterPropertiesHelper.getScriptLogLevel(propertiesParameters);
+                scriptLogLevel = SimulationParameterPropertiesHelper
+                        .getScriptLogLevel(propertiesParameters);
             } else {
                 scriptLogLevel = "info";
             }
@@ -1373,7 +1394,8 @@
     public String getLibLogLevel() {
         if (libLogLevel == null) {
             if (propertiesParameters != null) {
-                libLogLevel = SimulationParameterPropertiesHelper.getLibLogLevel(propertiesParameters);
+                libLogLevel = SimulationParameterPropertiesHelper
+                        .getLibLogLevel(propertiesParameters);
             } else {
                 libLogLevel = "error";
             }
@@ -1634,7 +1656,7 @@
         if (populations != null) {
             String populationList = "";
             for (Population pop : getPopulations()) {
-                populationList += pop.getName() + ",";
+                populationList += pop.getName() + LIST_SEPARATOR;
                 MatrixND number = getNumberOf(pop);
                 String numberAsString = String.valueOf(number.toList());
                 result.setProperty(
@@ -1660,7 +1682,7 @@
             String ruleList = "";
             int ruleIndex = 0;
             for (Rule rule : getRules()) {
-                ruleList += RuleStorage.getName(rule) + ",";
+                ruleList += RuleStorage.getName(rule) + LIST_SEPARATOR;
                 Properties ruleProp = RuleHelper.getRuleAsProperties(
                         ruleIndex++, getRegion().getStorage(), rule);
                 result.putAll(ruleProp);
@@ -1683,7 +1705,7 @@
             String planList = "";
             int planIndex = 0;
             for (SimulationPlan plan : getSimulationPlans()) {
-                planList += SimulationPlanStorage.getName(plan) + ",";
+                planList += SimulationPlanStorage.getName(plan) + LIST_SEPARATOR;
                 Properties planProp = StorageHelper.getParamsAsProperties(planIndex++,
                         getRegion().getStorage(), plan, SimulationParameterPropertiesHelper.PLAN_KEY);
                 result.putAll(planProp);
@@ -1755,7 +1777,7 @@
             ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
             for (Map.Entry<Export, Observation> exportObservationEntry : optimizationExportsObservations.entrySet()) {
                 Export export = exportObservationEntry.getKey();
-                optimizationExportsList += ExportStorage.getName(export) + ",";
+                optimizationExportsList += ExportStorage.getName(export) + LIST_SEPARATOR;
 
                 // add in props observation id export index
                 Observation observation = exportObservationEntry.getValue();
@@ -1783,7 +1805,7 @@
         }
         
         // export names
-        String exportList = StringUtils.join(getExportNames(), ",");
+        String exportList = StringUtils.join(getExportNames(), LIST_SEPARATOR);
         result.setProperty(SimulationParameterPropertiesHelper.EXPORTS_KEY, exportList);
 
         // number of sensitivity simulation
@@ -1821,7 +1843,7 @@
             int sensitivityExportIndex = 0;
             for (SensitivityExport sensitivityExport : getSensitivityExport()) {
                 sensitivityExportList += SensitivityExportStorage
-                        .getName(sensitivityExport) + ",";
+                        .getName(sensitivityExport) + LIST_SEPARATOR;
                 Properties exportProp = ExportHelper.getSensitivityExportAsProperties(
                         sensitivityExportIndex++, getRegion().getStorage(), sensitivityExport);
                 result.putAll(exportProp);

Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java	2014-07-29 10:03:58 UTC (rev 4071)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java	2014-07-29 11:25:57 UTC (rev 4072)
@@ -3,11 +3,13 @@
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixHelper;
 import org.nuiton.util.VersionUtil;
 
 import static org.nuiton.i18n.I18n.t;
@@ -61,14 +63,15 @@
     final public static String SENSITIVITY_ANALYSIS_KEY = "sensitivityanalysis";
     final public static String SENSITIVITY_KEY = "sensitivity";
     final public static String SENSITIVITY_EXPORTS_KEY = "sensitivityexports";
-    final public static String SENSITIVITY_EXPORT_KEY = "sensitivityexports";
+    final public static String SENSITIVITY_EXPORT_KEY = "sensitivityexport";
     final public static String POPULATION_KEY = "population";
     final public static String NUMBER_KEY = "number";
     final public static String NUMBER_OF_SENSITIVITY_SIMULATION_KEY = "numberOfSensitivitySimulation";
     final public static String SENSITIVITY_ANALYSIS_ONLY_KEEP_FIRST_KEY = "sensitivityAnalysisOnlyKeepFirst";
     final public static String TAG_VALUE_KEY = "tagValue";
+    final public static String PARAMETERS_KEY = "parameters";
+    final public static String PARAMETER_KEY = "parameter";
 
-
     public static String getIsisFishVersion(Properties prop) {
         String result = prop.getProperty(ISIS_FISH_VERSION_KEY, "");
         return result;
@@ -119,7 +122,22 @@
         return result;
     }
 
-    public static String[] getStrategieNames(Properties prop) {
+    /**
+     * Retourne les effectifs sous forme d'une liste de liste de double
+     * [[2, 3, 4], [5, 6, 7]]
+     *
+     * @param prop
+     * @param popName nom de la population dont on souhaite les effectifs
+     * @return
+     */
+    public static List getPopulationNumbers(Properties prop, String popName) {
+        String numberAsString = prop.getProperty(
+                POPULATION_KEY + DOT + popName + DOT + NUMBER_KEY);
+        List result = MatrixHelper.convertStringToList(numberAsString);
+        return result;
+    }
+
+   public static String[] getStrategieNames(Properties prop) {
         String[] result = StringUtils.split(prop.getProperty(STRATEGIES_KEY, ""), LIST_SEPARATOR);
         return result;
     }
@@ -180,6 +198,16 @@
         return result;
     }
 
+    public static String getSensitivityAnalysis(Properties prop) {
+        String result = prop.getProperty(SENSITIVITY_ANALYSIS_KEY);
+        return result;
+    }
+
+    public static String[] getSensitivityExportNames(Properties prop) {
+        String[] result = StringUtils.split(prop.getProperty(SENSITIVITY_EXPORTS_KEY, ""), LIST_SEPARATOR);
+        return result;
+    }
+
     public static int getNumberOfSensitivitySimulation(Properties prop) {
         int result = Integer.valueOf(prop.getProperty(
                 NUMBER_OF_SENSITIVITY_SIMULATION_KEY, "-1"));
@@ -208,6 +236,11 @@
         return result;
     }
 
+    public static boolean getUseStatistic(Properties prop) {
+        boolean result = Boolean.valueOf(prop.getProperty(USE_STATISTIC_KEY, "false"));
+        return result;
+    }
+
     public static String getSimulLogLevel(Properties prop) {
         String result = prop.getProperty(SIMUL_LOG_LEVEL_KEY, "info");
         return result;
@@ -249,7 +282,7 @@
     public static Map<String, String> getParamAsString(Properties prop, String prefix, int index) {
         Map<String, String> result = new HashMap<String, String>();
         if (prop != null) {
-            String paramTag = prefix + DOT + index + ".parameter.";
+            String paramTag = prefix + DOT + index + DOT + PARAMETER_KEY + DOT;
             int paramTagLength = paramTag.length();
 
             for (String key : prop.stringPropertyNames()) {
@@ -337,7 +370,7 @@
         for (String name : getRuleNames(prop)) {
             result.append(t("isisfish.params.toString.rule", name));
             result.append('\n');
-            for (Map.Entry<String, String> e : getParamAsString(prop, "rule", cpt++).entrySet()) {
+            for (Map.Entry<String, String> e : getParamAsString(prop, RULE_KEY, cpt++).entrySet()) {
                 result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n");
             }
             result.append("\n");
@@ -350,7 +383,7 @@
         for (String plan : getSimulationPlanNames(prop)) {
             result.append(t("isisfish.params.toString.plan", plan));
             result.append('\n');
-            for (Map.Entry<String, String> e : getParamAsString(prop, "plan", cpt++).entrySet()) {
+            for (Map.Entry<String, String> e : getParamAsString(prop, PLAN_KEY, cpt++).entrySet()) {
                 result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n");
             }
             result.append('\n');

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2014-07-29 10:03:58 UTC (rev 4071)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2014-07-29 11:25:57 UTC (rev 4072)
@@ -102,6 +102,13 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.DOT;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.NUMBER_KEY;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETER_KEY;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETERS_KEY;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.POPULATION_KEY;
+import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULE_KEY;
+
 /**
  * SimulAction.
  *
@@ -351,7 +358,8 @@
                 preRemoveRule((FactorGroup)factor, ruleIndex);
             }
             else {
-                Pattern factorPathPattern = Pattern.compile("^(parameters\\.rule\\.)(\\d+)(.*)$");
+                Pattern factorPathPattern = Pattern.compile(
+                        "^(" +PARAMETERS_KEY + "\\" + DOT + RULE_KEY + "\\" + DOT + ")(\\d+)(.*)$");
                 Matcher factorPathMatcher = factorPathPattern.matcher(factor.getPath());
                 if (factorPathMatcher.find()) {
                     Integer index = Integer.parseInt(factorPathMatcher.group(2));
@@ -1247,7 +1255,7 @@
 
         // new factor with rule domain
         if (source instanceof RuleChooser) {
-            String factorPath = "parameters.rules";
+            String factorPath = PARAMETERS_KEY + DOT + RULE_KEY;
             selectedFactor = getFactor(factorPath);
             if (selectedFactor == null) {
                 selectedFactor = new Factor(t("isisfish.sensitivity.rulesfactorname"));
@@ -1259,7 +1267,7 @@
         // new factor with matrix continous domain
         else if (source instanceof MatrixPanelEditor) {
             Population population = (Population)source.getClientProperty("sensitivityPopulation");
-            String factorPath = "parameters.population." + population.getName() + ".number";
+            String factorPath = PARAMETERS_KEY + DOT + POPULATION_KEY + DOT + population.getName() + DOT + NUMBER_KEY;
             selectedFactor = getFactor(factorPath);
             if (selectedFactor == null) {
                 selectedFactor = new Factor(t("isisfish.sensitivity.populationfactorname", population.getName()));
@@ -1301,7 +1309,8 @@
         // with rule list, if a rule is deleted, factor on it must
         // be deleted too, et next factor must be renamed
         int index = ruleChooser.getRulesList().indexOf(rule);
-        String factorPath = "parameters.rule." + index + ".parameter." + paramName;
+        String factorPath = PARAMETERS_KEY + DOT + RULE_KEY + DOT + index + DOT
+                + PARAMETER_KEY + DOT + paramName;
         //try {
 
             /*// on a besoin de la valeur pour savoir s'il peut être continue

    

[Isis-fish-commits] r4072 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export simulator ui/simulator

bpoussin＠users.forge.codelutin.com