Author: chatellier Date: 2009-04-22 10:30:56 +0000 (Wed, 22 Apr 2009) New Revision: 2136 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Reload sensivity calculator when reloading simulation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2009-04-22 09:38:44 UTC (rev 2135) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2009-04-22 10:30:56 UTC (rev 2136) @@ -96,13 +96,13 @@ } /** - * Retourne le nom de tous les calculateurs de sensibilité existans. + * Retourne le nom de tous les calculateurs de sensibilité existant. * * @return le nom de tous les calculateurs de sensibilité existans en local */ public static List<String> getSensitivityNames() { File dir = getSensitivityDirectory(); - return SensitivityStorage.getStorageNames(dir); + return getStorageNames(dir); } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-22 09:38:44 UTC (rev 2135) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-22 10:30:56 UTC (rev 2136) @@ -59,14 +59,21 @@ public void refreshSelectedSensitivityCalculator() { SensitivityCalculator calculator = getSimulAction().getSensitivityCalculator(); if (calculator != null) { + if (log.isDebugEnabled()) { + log.debug("Refreshing calculator list"); + } // TODO it's not getSimpleName() here ! - String name = calculator.getClass().getSimpleName(); - fieldSensitivityCalculatorSelect.setSelectedItem( - new Item(name, name, name, false)); + fieldSensitivityCalculatorSelect.setSelectedItem(calculator.getClass().getSimpleName()); } } protected void sensCalculatorChanged() { + + // TODO change combo box content + // when calculator is changed by refreshSelectedSensitivityCalculator + // this event is thrown by build a new Calculator instance + // and parameter are lost + if (fieldSensitivityCalculatorSelect.getSelectedIndex() != -1) { String sensitivityName = (String)fieldSensitivityCalculatorSelect.getSelectedItem(); getSimulAction().setSensitivity(sensitivityName); 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 2009-04-22 09:38:44 UTC (rev 2135) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-04-22 10:30:56 UTC (rev 2136) @@ -43,7 +43,7 @@ <SensitivityTabUI id="sensitivityTabUI" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)'/> </tab> <tab title='isisfish.sensitivityChooser.title'> - <SensitivityChooserUI id="sensitivityChooserUI" constructorParams='new JAXXInitialContext().add(this)'/> + <SensitivityChooserUI id="sensitivityChooserUI" constructorParams='this'/> </tab> <tab id="exportUITab" title='isisfish.export.title'> <ExportUI id="exportUI" constructorParams='getContextValue(SimulAction.class)'/> 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 2009-04-22 09:38:44 UTC (rev 2135) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-22 10:30:56 UTC (rev 2136) @@ -354,9 +354,17 @@ } } + /** + * Return rules name without .java extention. + * + * @return rule names list + */ public List<String> getRuleNames() { List<String> result = new ArrayList<String>(); for (String r : RuleStorage.getRuleNames()) { + // Remove .java extention + // TODO find a better way to to that + // for example RuleStorage.getRuleName(String) result.add(r.substring(0, r.length() - 5)); } return result; @@ -812,8 +820,20 @@ return result; } + /** + * Return sensitivity calculator name without .java extention + * + * @return sensitivity calculator names list + */ public List<String> getSensitivityNames() { - return SensitivityStorage.getSensitivityNames(); + List<String> result = new ArrayList<String>(); + for (String r : SensitivityStorage.getSensitivityNames()) { + // Remove .java extention + // TODO find a better way to to that + // for example SensitivityStorage.getRuleName(String) + result.add(r.substring(0, r.length() - 5)); + } + return result; } public Map<String, Class<?>> getSensitivityParameterNames(String name) {