[Isis-fish-commits] r4273 - in branches/isis-fish-4.4.0-resultname/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/sensitivity java/fr/ifremer/isisfish/ui java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/models/export java/fr/ifremer/isisfish/ui/models/optimization java/fr/ifremer/isisfish/ui/models/result java/fr/ifremer/isisfish/ui/models/rule java/fr/ifremer/isisfish/ui/models/sensitivityanalysis java/fr/ifremer/isisfish/ui/models/sensitivityexport java/fr/ifr

Author: echatellier Date: 2015-06-19 16:53:53 +0000 (Fri, 19 Jun 2015) New Revision: 4273 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4273 Log: fixes #7210: Add result storage to manage resultat as script files Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeContext.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityContext.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportHandler.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceHandler.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/util/RendererHelper.java branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -1368,6 +1368,8 @@ if (VersionUtil.smallerThan(getIsisFishVersion(), "4.4.0.0")) { for (String result : resultList) { String migrated = StringUtils.capitalize(result); + // .java must be added to be like others properties + migrated += ".java"; resultEnabled.add(migrated); } } else { Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -370,7 +370,9 @@ String directoryPath = directory.toString() + File.separator + SimulationStorage.RESULT_EXPORT_DIRECTORY; + File importFile = new File(directoryPath, name + extension); + System.out.println("result=" + importFile); String simulResult = ""; try { Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -96,24 +96,12 @@ if (sensitivityProperties == null) { sensitivityProperties = new Properties(); - InputStream stream = null; - try { - stream = SensitivityUtils.class.getResourceAsStream(PROPERTIES_PATH); + try (InputStream stream = SensitivityUtils.class.getResourceAsStream(PROPERTIES_PATH)) { sensitivityProperties.load(stream); } catch (IOException ex) { if (log.isErrorEnabled()) { log.error("Can't load sensitivity properties file", ex); } - } finally { - try { - if (stream != null) { - stream.close(); - } - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't load sensitivity properties file", ex); - } - } } } return sensitivityProperties; Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeContext.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeContext.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeContext.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -22,14 +22,14 @@ */ package fr.ifremer.isisfish.ui; -import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.context.DefaultJAXXContext; -public class WelcomeContext extends JAXXInitialContext { +public class WelcomeContext extends DefaultJAXXContext { protected WelcomeSaveVerifier verifier = new WelcomeSaveVerifier(); public WelcomeContext() { - add(verifier); + setContextValue(verifier); } } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/input/InputContext.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -24,21 +24,21 @@ import fr.ifremer.isisfish.ui.WelcomeSaveVerifier; import jaxx.runtime.JAXXContext; -import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.context.DefaultJAXXContext; /** * Ce contexte regroupe les élements qui servent à une hierachie d'interfaces Input. * * @author Eric Chatellier */ -public class InputContext extends JAXXInitialContext { +public class InputContext extends DefaultJAXXContext { public InputContext(JAXXContext parent) { setParentContext(parent); // add save verifier for this hierarchy InputSaveVerifier inputSaveVerifier = new InputSaveVerifier(); - add(inputSaveVerifier); + setContextValue(inputSaveVerifier); // this verifier is linked to global verifier WelcomeSaveVerifier welcomeSaveVerifier = getContextValue(WelcomeSaveVerifier.class); Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.export; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public ExportNameListRenderer() { - exportCache = new HashMap<String, ExportInfo>(); + exportCache = new HashMap<>(); } /* @@ -76,7 +74,7 @@ index, isSelected, cellHasFocus); String exportName = (String) value; - c.setText(exportName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache @@ -88,12 +86,13 @@ exportCache.put(exportName, export); } - c.setToolTipText(export.getDescription()); + text = RendererHelper.getNameAndDocListString(exportName, export.getDescription()); } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", exportName)); - c.setToolTipText(errorTooltip); + text = RendererHelper.getNameAndCompListString(exportName); } + c.setText(text); + return c; } } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -61,7 +61,7 @@ public void setOptimizationExportsObservations(Map<ExportInfo, Observation> optimizationExportsObservations) { this.optimizationExportsObservations = optimizationExportsObservations; - keysCache = new ArrayList<ExportInfo>(optimizationExportsObservations.keySet()); + keysCache = new ArrayList<>(optimizationExportsObservations.keySet()); fireTableDataChanged(); } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.optimization; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public ObjectiveComboRenderer() { - objectiveCache = new HashMap<String, Objective>(); + objectiveCache = new HashMap<>(); } /* @@ -76,23 +74,26 @@ index, isSelected, cellHasFocus); String objectiveName = (String) value; - c.setText(objectiveName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache - try { - Objective objective = objectiveCache.get(objectiveName); - if (objective == null) { - ObjectiveStorage storage = ObjectiveStorage - .getObjective(objectiveName); - objective = storage.getNewInstance(); - objectiveCache.put(objectiveName, objective); + if (objectiveName != null) { + try { + Objective objective = objectiveCache.get(objectiveName); + if (objective == null) { + ObjectiveStorage storage = ObjectiveStorage + .getObjective(objectiveName); + objective = storage.getNewInstance(); + objectiveCache.put(objectiveName, objective); + } + + text = RendererHelper.getNameAndDocComboString(objectiveName, objective.getDescription()); + } catch (Exception e) { + text = RendererHelper.getNameAndCompComboString(objectiveName); } - - c.setToolTipText(objective.getDescription()); - } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", objectiveName)); - c.setToolTipText(errorTooltip); + + c.setText(text); } return c; Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.optimization; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public OptimizationComboRenderer() { - optimizationCache = new HashMap<String, Optimization>(); + optimizationCache = new HashMap<>(); } /* @@ -76,23 +74,26 @@ index, isSelected, cellHasFocus); String optimizationName = (String) value; - c.setText(optimizationName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache - try { - Optimization optim = optimizationCache.get(optimizationName); - if (optim == null) { - OptimizationStorage storage = OptimizationStorage - .getOptimization(optimizationName); - optim = storage.getNewInstance(); - optimizationCache.put(optimizationName, optim); + if (optimizationName != null) { + try { + Optimization optim = optimizationCache.get(optimizationName); + if (optim == null) { + OptimizationStorage storage = OptimizationStorage + .getOptimization(optimizationName); + optim = storage.getNewInstance(); + optimizationCache.put(optimizationName, optim); + } + + text = RendererHelper.getNameAndDocComboString(optimizationName, optim.getDescription()); + } catch (Exception e) { + text = RendererHelper.getNameAndCompComboString(optimizationName); } - - c.setToolTipText(optim.getDescription()); - } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", optimizationName)); - c.setToolTipText(errorTooltip); + + c.setText(text); } return c; Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -88,12 +88,9 @@ resultNameCache.put(resultNameName, resultInfo); } - text = RendererHelper.getNameAndDocString(resultNameName, resultInfo.getDescription()); + text = RendererHelper.getNameAndDocListString(resultNameName, resultInfo.getDescription()); } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("eee", ex); - } - text = RendererHelper.getNameAndCompilationString(resultNameName); + text = RendererHelper.getNameAndCompListString(resultNameName); } c.setText(text); Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -33,6 +33,7 @@ import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.ui.util.RendererHelper; /** * Rendu des données d'une liste graphique de regles @@ -63,13 +64,15 @@ if (value != null) { Rule rule = (Rule) value; String ruleName = RuleStorage.getName(rule); - c.setText(ruleName); - + + String text; try { - c.setToolTipText(rule.getDescription()); + text = RendererHelper.getNameAndDocListString(ruleName, rule.getDescription()); } catch (Exception e) { - // can't get exception + text = RendererHelper.getNameAndDocListString(ruleName, ""); } + + c.setText(text); } return c; Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -58,7 +58,7 @@ * Empty constructor. */ public RuleNamesListRenderer() { - ruleCache = new HashMap<String, Rule>(); + ruleCache = new HashMap<>(); } /* @@ -104,9 +104,9 @@ ruleCache.put(ruleName, rule); } - text = RendererHelper.getNameAndDocString(ruleName, rule.getDescription()); + text = RendererHelper.getNameAndDocListString(ruleName, rule.getDescription()); } catch (Exception ex) { - text = RendererHelper.getNameAndCompilationString(ruleName); + text = RendererHelper.getNameAndCompListString(ruleName); } c.setText(text); Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -107,6 +107,7 @@ addRuleParameterFactor(ruleChooser, rule, paramName); } }); + button.setToolTipText(t("isisfish.sensitivity.ruleparameterfactortip")); comp = button; } } catch (IsisFishException ex) { Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,6 +25,8 @@ package fr.ifremer.isisfish.ui.models.rule; +import static org.nuiton.i18n.I18n.t; + import java.awt.Component; import javax.swing.JButton; @@ -81,7 +83,9 @@ Class paramType = RuleStorage.getParameterType(rule, paramName); boolean canBeFactor = SensitivityUtils.canBeFactor(paramType); if (canBeFactor) { - comp = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); + JButton button = new JButton(Resource.getIcon("/icons/sensitivity/flag--plus.png")); + button.setToolTipText(t("isisfish.sensitivity.ruleparameterfactortip")); + comp = button; } } catch (IsisFishException ex) { if (log.isWarnEnabled()) { Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.sensitivityanalysis; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public SensitivityAnalysisComboRenderer() { - sensitivityAnalysisCache = new HashMap<String, SensitivityAnalysis>(); + sensitivityAnalysisCache = new HashMap<>(); } /* @@ -76,23 +74,26 @@ index, isSelected, cellHasFocus); String sensitivityName = (String) value; - c.setText(sensitivityName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache - try { - SensitivityAnalysis plan = sensitivityAnalysisCache.get(sensitivityName); - if (plan == null) { - SensitivityAnalysisStorage storage = SensitivityAnalysisStorage - .getSensitivityAnalysis(sensitivityName); - plan = storage.getNewInstance(); - sensitivityAnalysisCache.put(sensitivityName, plan); + if (sensitivityName != null) { + try { + SensitivityAnalysis plan = sensitivityAnalysisCache.get(sensitivityName); + if (plan == null) { + SensitivityAnalysisStorage storage = SensitivityAnalysisStorage + .getSensitivityAnalysis(sensitivityName); + plan = storage.getNewInstance(); + sensitivityAnalysisCache.put(sensitivityName, plan); + } + + text = RendererHelper.getNameAndDocComboString(sensitivityName, plan.getDescription()); + } catch (Exception e) { + text = RendererHelper.getNameAndCompComboString(sensitivityName); } - - c.setToolTipText(plan.getDescription()); - } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName)); - c.setToolTipText(errorTooltip); + + c.setText(text); } return c; Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.sensitivityexport; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public SensitivityExportNameListRenderer() { - sensitivityExportCache = new HashMap<String, SensitivityExport>(); + sensitivityExportCache = new HashMap<>(); } /* @@ -76,7 +74,7 @@ index, isSelected, cellHasFocus); String exportName = (String) value; - c.setText(exportName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache @@ -88,11 +86,12 @@ sensitivityExportCache.put(exportName, export); } - c.setToolTipText(export.getDescription()); + text = RendererHelper.getNameAndDocListString(exportName, export.getDescription()); } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", exportName)); - c.setToolTipText(errorTooltip); + text = RendererHelper.getNameAndCompListString(exportName); } + + c.setText(text); return c; } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.ui.models.simulationplan; -import static org.nuiton.i18n.I18n.t; - import java.awt.Component; import java.util.HashMap; import java.util.Map; @@ -60,7 +58,7 @@ * Empty constructor. */ public SimulationPlanComboRenderer() { - simulationPlanCache = new HashMap<String, SimulationPlan>(); + simulationPlanCache = new HashMap<>(); } /* @@ -76,7 +74,7 @@ index, isSelected, cellHasFocus); String simulationPlanName = (String) value; - c.setText(simulationPlanName); + String text = null; // c'est tres couteux d'avoir une instance // on les met en cache @@ -89,11 +87,12 @@ simulationPlanCache.put(simulationPlanName, plan); } - c.setToolTipText(plan.getDescription()); + text = RendererHelper.getNameAndDocComboString(simulationPlanName, plan.getDescription()); } catch (Exception e) { - String errorTooltip = RendererHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", simulationPlanName)); - c.setToolTipText(errorTooltip); + text = RendererHelper.getNameAndCompComboString(simulationPlanName); } + + c.setText(text); return c; } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityContext.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityContext.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityContext.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -40,7 +40,7 @@ // add save verifier for this hierarchy (input) SensitivitySaveVerifier sensitivitySaveVerifier = new SensitivitySaveVerifier(); - add(sensitivitySaveVerifier); + setContextValue(sensitivitySaveVerifier); // this verifier is linked to global verifier (input) WelcomeSaveVerifier welcomeSaveVerifier = getContextValue(WelcomeSaveVerifier.class); Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2015-06-19 16:53:53 UTC (rev 4273) @@ -39,6 +39,8 @@ @Override public void refresh() { paramsUI.getHandler().refresh(); + resultChoiceUI.getHandler().refresh(); + exportUI.getHandler().refresh(); advancedParamsUI.getHandler().refresh(); } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportHandler.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportHandler.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportHandler.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -24,7 +24,7 @@ import static org.nuiton.i18n.I18n.t; -import java.util.ArrayList; +import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -35,7 +35,6 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.ExportStorage; -import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.models.common.GenericListModel; @@ -61,23 +60,20 @@ } public void refresh() { - - // FIXME listen for export modification here - // fill export setListSimulExportChooseModel(); } protected void setListSimulExportChooseModel() { - java.util.List<String> availableExports = getExportNames(); - java.util.List<String> userExports = getParameters().getExportNames(); - // userExports = intersection(userExports,availableExports) - userExports.retainAll(availableExports); + Collection<String> paramExports = getParameters().getExportNames(); + + // get full list + List<String> availableExports = ExportStorage.getExportNames(); GenericListModel<String> exportModel = new GenericListModel<>(availableExports); tabUI.listSimulExportChoose.setModel(exportModel); - for (String userExport : userExports) { + for (String userExport : paramExports) { int index = availableExports.indexOf(userExport); tabUI.listSimulExportChoose.addSelectionInterval(index, index); } @@ -85,13 +81,9 @@ protected void saveSimulationExports(ListSelectionEvent event) { // Set exports (this can save empty list (not a big deal)) - List<String> values = tabUI.listSimulExportChoose.getSelectedValuesList(); - List<String> exportNames = new LinkedList<>(); - for (String o : values) { - exportNames.add(o); - } + List<String> exportNames = new LinkedList<>(tabUI.listSimulExportChoose.getSelectedValuesList()); getParameters().setExportNames(exportNames); - + if (log.isDebugEnabled()) { log.debug("Set exports in simulation : " + exportNames); } @@ -99,14 +91,9 @@ protected void saveConfigExports() { // Set exports (this can save empty list (not a big deal)) - List<String> values = tabUI.listSimulExportChoose.getSelectedValuesList(); - List<String> exportNames = new LinkedList<>(); - for (String o : values) { - exportNames.add(o); - } - getParameters().setExportNames(exportNames); - - saveExport(); + List<String> exportNames = new LinkedList<>(tabUI.listSimulExportChoose.getSelectedValuesList()); + IsisFish.config.setDefaultExportNames(exportNames); + setInfoText(t("isisfish.export.saved")); } @@ -115,30 +102,4 @@ WelcomePanelUI root = tabUI.getParentContainer(WelcomePanelUI.class); root.setStatusMessage(txt); } - - /* - * ExportUI - */ - - public List<String> getExportNames() { - List<String> exportNames = ExportStorage.getExportNames(); - List<String> result = new ArrayList<>(exportNames); - return result; - } - - /** - * Save current parameters exports names in configuration. - */ - public void saveExport() { - - SimulationParameter param = getParameters(); - if (param.getExportNames() != null) { - - if (log.isDebugEnabled()) { - log.debug("Set exports in configuration : " + param.getExportNames()); - } - - IsisFish.config.setDefaultExportNames(param.getExportNames()); - } - } } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2015-06-19 16:53:53 UTC (rev 4273) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table> +<JPanel layout='{new BorderLayout()}'> <ExportHandler id="handler" constructorParams="this" /> <script><![CDATA[ @@ -31,20 +31,14 @@ } ]]></script> - <row> - <cell fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - genericType="String" - cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' - onValueChanged='handler.saveSimulationExports(event)' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='handler.saveConfigExports()'/> - </cell> - </row> -</Table> + <JScrollPane constraints='BorderLayout.CENTER'> + <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + genericType="String" + cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' + selectionModel="{new jaxx.runtime.swing.OneClicListSelectionModel(listSimulExportChoose.getSelectionModel(), listSimulExportChoose.getModel())}" + onValueChanged='handler.saveSimulationExports(event)' /> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='handler.saveConfigExports()'/> +</JPanel> Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -62,7 +62,6 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.datastore.StorageChangeEvent; import fr.ifremer.isisfish.datastore.StorageChangeListener; import fr.ifremer.isisfish.datastore.StorageException; @@ -201,7 +200,7 @@ log.debug("call loadOldSimulation: " + simulName); } try { - SimulatorContext context = tabUI.getContextValue(SimulatorContext.class); + SimulatorContext context = tabUI.getContextValue(SimulatorContext.class, "SimulatorContext"); // read storage to get name SimulationStorage simulStorage = SimulationStorage.getSimulation(simulName); @@ -488,6 +487,8 @@ for (Population selectedPopulation : selectedPopulationsValues) { final MatrixPanelEditor matrixPanel = new MatrixPanelEditor(); + final String populationName = selectedPopulation.getName(); + MatrixND populationEffectives = getParameters().getNumberOf(selectedPopulation); matrixPanel.setMatrix(populationEffectives); @@ -508,6 +509,8 @@ Object result = null; if (key.equals(Action.SMALL_ICON)) { result = SwingUtil.createImageIcon("sensitivity/flag--plus.png"); + } else if (key.equals(Action.SHORT_DESCRIPTION)) { + result = t("isisfish.params.populationEffectives.factorTooltip", populationName); } return result; } @@ -516,7 +519,7 @@ } tabUI.getPopulationEffectivesTabbedPane().add(matrixPanelComponent, - t("isisfish.params.populationEffectives", selectedPopulation.getName())); + t("isisfish.params.populationEffectives", populationName)); } layout.show(tabUI.getPopulationEffectivesPanel(), "specific"); Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-06-19 16:53:53 UTC (rev 4273) @@ -211,6 +211,7 @@ <cell anchor="north"> <JButton id="addRuleFactorButton" icon='{SwingUtil.createImageIcon("sensitivity/flag--plus.png")}' + toolTipText="isisfish.params.rules.ruleSetFactor" onActionPerformed="handler.addFactorWithComponent(ruleChooser)" visible="{isSensitivity()}" enabled="{getRegionStorage() != null}" /> Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceHandler.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceHandler.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceHandler.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -25,6 +25,7 @@ import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import javax.swing.event.ListSelectionEvent; @@ -60,43 +61,39 @@ public void refresh() { setResultNameModel(); } - + + /** + * Reset model with selection on current parameters to work with simulation reload(); + */ protected void setResultNameModel() { + Collection<String> userResults = getParameters().getResultEnabled(); + // get full list - List<String> availableResults = ResultInfoStorage.getResultInfoNames(); - GenericListModel<String> resultModel = new GenericListModel<>(availableResults); + List<String> allResults = ResultInfoStorage.getResultInfoNames(); + GenericListModel<String> resultModel = new GenericListModel<>(allResults); tabUI.listResultNames.setModel(resultModel); // restore previous selection - List<String> userResults = IsisFish.config.getDefaultResultNamesAsList(); for (String userResult : userResults) { - int index = availableResults.indexOf(userResult); + int index = allResults.indexOf(userResult); tabUI.listResultNames.addSelectionInterval(index, index); } } protected void saveParametersResultNames(ListSelectionEvent event) { - saveParametersResultNames(tabUI.listResultNames.getSelectedValuesList()); - } - - protected void saveConfigResultNames() { - saveConfigurationResultNames(tabUI.listResultNames.getSelectedValuesList()); - setStatusMessage(t("isisfish.resultChoice.saved")); - } - - public void saveParametersResultNames(List<String> resultNames) { - List<String> resultNamesString = new ArrayList<>(resultNames); + List<String> resultNamesString = new ArrayList<>(tabUI.listResultNames.getSelectedValuesList()); getParameters().setResultEnabled(resultNamesString); if (log.isDebugEnabled()) { log.debug("Set simulation result names : " + resultNamesString); } } - - public void saveConfigurationResultNames(List<String> resultNames) { - List<String> resultNamesString = new ArrayList<>(resultNames); + + protected void saveConfigResultNames() { + List<String> resultNamesString = new ArrayList<>(tabUI.listResultNames.getSelectedValuesList()); IsisFish.config.setDefaultResultNames(resultNamesString); - + setStatusMessage(t("isisfish.resultChoice.saved")); + if (log.isDebugEnabled()) { log.debug("Set configuration result names : " + resultNamesString); } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2015-06-19 16:53:53 UTC (rev 4273) @@ -37,6 +37,7 @@ <JList id="listResultNames" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" genericType="String" cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultInfoNameListRenderer()}' + selectionModel="{new jaxx.runtime.swing.OneClicListSelectionModel(listResultNames.getSelectionModel(), listResultNames.getModel())}" onValueChanged='handler.saveParametersResultNames(event)' /> </JScrollPane> <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='handler.saveConfigResultNames()'/> Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -35,13 +35,14 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.ResultInfoStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; import fr.ifremer.isisfish.ui.util.ErrorHelper; import jaxx.runtime.JAXXContext; -import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.context.DefaultJAXXContext; /** * Ce contexte regroupe les élements qui servent à une hierachie d'interfaces Simulator. @@ -56,7 +57,7 @@ * * @author Eric Chatellier */ -public class SimulatorContext extends JAXXInitialContext { +public class SimulatorContext extends DefaultJAXXContext { private static final Log log = LogFactory.getLog(SimulatorContext.class); @@ -65,23 +66,24 @@ initDefaultParameters(); initFactorGroup(); - // concurrentmodification : setSimulatorContext(this); + setSimulatorContext(this); } public void setSimulationParameter(SimulationParameter param) { - add(param); + setContextValue(param); } public void setFactorGroup(FactorGroup factorGroup) { - add(factorGroup); + setContextValue(factorGroup); } public void setRegionStorage(RegionStorage regionStorage) { - add(regionStorage); + setContextValue(regionStorage); } public void setSimulatorContext(SimulatorContext simulatorContext) { - add(simulatorContext); + // add this one named to prevent infinite loop + setContextValue(simulatorContext, "SimulatorContext"); } /** @@ -102,7 +104,7 @@ if (defaultResultNames != null) { param.setResultEnabled(defaultResultNames); } else { - List<String> allResultNames = getResultNames(); + List<String> allResultNames = ResultInfoStorage.getResultInfoNames(); param.setResultEnabled(allResultNames); } @@ -117,40 +119,12 @@ } /** - * Looking for ResultName.java script and read all fields and fill - * list of field value and doc - * @return the list of result names found in ResultName script - * - * @deprecated duplicated with another one - */ - @Deprecated - protected List<String> getResultNames() { - List<String> result = new ArrayList<String>(); - try { - ScriptStorage storage = ScriptStorage.getScript("ResultName.java"); - Class<?> resultNameClass = storage.getCodeClass(); - // TODO: if we can't find class, perhaps try to parser Java source ? - Field[] fields = resultNameClass.getFields(); - for (Field f : fields) { - String fieldName = (String) f.get(null); - result.add(fieldName); - } - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find result name script", eee); - } - ErrorHelper.showErrorDialog(t("isisfish.error.simulation.getresultname"), eee); - } - return result; - } - - /** * List de facteur sous forme d'arbre (factor group). * {@code null} name for compatibility with 3.3.0.0. */ protected void initFactorGroup() { FactorGroup factorGroup = new FactorGroup(null); - add(factorGroup); + setContextValue(factorGroup); } } Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/util/RendererHelper.java =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/util/RendererHelper.java 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/util/RendererHelper.java 2015-06-19 16:53:53 UTC (rev 4273) @@ -43,8 +43,8 @@ */ public class RendererHelper { - protected static final String DOCUMENTATION_SUBTITLE = "<html><b>%s</b><br /><font color='gray'>%s</font></html>"; - protected static final String COMPILATION_SUBTITLE = "<html><b>%s</b><br /><font color='red'>%s</font></html>"; + protected static final String DOCUMENTATION_SUBTITLE = "<html><b>%s</b>%s<font color='gray'>%s</font></html>"; + protected static final String COMPILATION_SUBTITLE = "<html><b color='red'>%s</b>%s<font color='red'>%s</font></html>"; /** * Return HTML formatted tooltip. @@ -86,32 +86,24 @@ } return tooltip; } - - /** - * Format error as tootip error messsage. - * - * @param errorMessage error message - * @return html formated string - * @deprecated since 4.4, should be replaced by renderer with description - */ - @Deprecated - public static String getErrorTooltip(String errorMessage) { - StringBuilder sb = new StringBuilder(); - sb.append("<html>"); - sb.append("<font color='red'><b>"); - sb.append(errorMessage); - sb.append("</b></font>"); - sb.append("</html>"); - return sb.toString(); + + public static String getNameAndDocListString(String name, String documentation) { + String result = String.format(DOCUMENTATION_SUBTITLE, name, "<br />", documentation); + return result; } - public static String getNameAndDocString(String name, String documentation) { - String result = String.format(DOCUMENTATION_SUBTITLE, name, documentation); + public static String getNameAndCompListString(String name) { + String result = String.format(COMPILATION_SUBTITLE, name, "<br />", t("isisfish.error.compile.documentationerror")); return result; } + + public static String getNameAndDocComboString(String name, String documentation) { + String result = String.format(DOCUMENTATION_SUBTITLE, name, " - ", documentation); + return result; + } - public static String getNameAndCompilationString(String name) { - String result = String.format(COMPILATION_SUBTITLE, name, t("isisfish.error.compile.documentationerror")); + public static String getNameAndCompComboString(String name) { + String result = String.format(COMPILATION_SUBTITLE, name, " - ", t("isisfish.error.compile.documentationerror")); return result; } } Modified: branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-19 16:53:53 UTC (rev 4273) @@ -618,8 +618,10 @@ isisfish.params.nopopulation=No selected population isisfish.params.numberMonth=Number of months isisfish.params.populationEffectives=%s's effectives +isisfish.params.populationEffectives.factorTooltip=Define %s's effectives as factor (replace default effectives) isisfish.params.rules=Rules isisfish.params.rules.availables=Available rules +isisfish.params.rules.ruleSetFactor=Define rule set factor (replace default rule set) isisfish.params.rules.selected=Selected rules isisfish.params.rules.tooltip=Rules are executed ordered \! You can change order using drag and drop. isisfish.params.sensitivityName=Sensitivity name @@ -864,6 +866,7 @@ isisfish.sensitivity.newfactorname=Factor group name isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.ruleparameterfactorname=Param rule %s.%s +isisfish.sensitivity.ruleparameterfactortip=Define this parameter as factor (replace default value) isisfish.sensitivity.rulesfactorname=Rule set isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results Modified: branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-17 17:01:56 UTC (rev 4272) +++ branches/isis-fish-4.4.0-resultname/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-19 16:53:53 UTC (rev 4273) @@ -618,8 +618,10 @@ isisfish.params.nopopulation=Aucune population sélectionnée isisfish.params.numberMonth=Nombre de mois isisfish.params.populationEffectives=Effectifs %s +isisfish.params.populationEffectives.factorTooltip=Définir les effectifs de %s en tant que facteur (Remplace les effectifs par défaut) isisfish.params.rules=Règles isisfish.params.rules.availables=Règles disponibles +isisfish.params.rules.ruleSetFactor=Définir un facteur d'ensembles de règles (remplace le jeu de règle par defaut) isisfish.params.rules.selected=Règles sélectionnées isisfish.params.rules.tooltip=Les règles sont executées dans l'ordre défini \! Vous pouvez modifier l'ordre à l'aide du glisser-déposer. isisfish.params.sensitivityName=Nom de l'analyse de sensibilité @@ -864,6 +866,7 @@ isisfish.sensitivity.newfactorname=Nom du groupe de facteurs isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.ruleparameterfactorname=Param regle %s.%s +isisfish.sensitivity.ruleparameterfactortip=Définir ce paramètre en tant que facteur (remplace la valeur par défaut) isisfish.sensitivity.rulesfactorname=Ensemble de règles isisfish.sensitivity.secondpass=Analyse des résultats isisfish.sensitivity.secondpass.title=Analyse des résultats