Author: sletellier Date: 2009-02-02 16:18:21 +0000 (Mon, 02 Feb 2009) New Revision: 1773 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.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 Log: La liste des simulations se rafraichie corectement. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-02-02 16:18:21 UTC (rev 1773) @@ -10,6 +10,7 @@ * @version */ +import java.beans.PropertyChangeEvent; import java.util.logging.Level; import java.util.logging.Logger; import static org.codelutin.i18n.I18n._; @@ -29,6 +30,7 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; +import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; import java.io.IOException; import java.text.ParseException; @@ -42,11 +44,8 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; - public ResultView (){ - super(); + SimulationServiceListener listener = new SimulationServiceListener() { - SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() { - @Override public void simulationStart(SimulationService simService, SimulationJob job) { } @@ -65,9 +64,12 @@ @Override public void clearJobDone(SimulationService simService) { } - }); + }; + + public ResultView (){ + super(); + SimulationService.getService().addSimulationServiceListener(listener); init(); - try { initSimulation(); } catch (Exception e) { 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 2009-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 16:18:21 UTC (rev 1773) @@ -70,20 +70,21 @@ @Override public void simulationStop(SimulationService simService, SimulationJob job) { - fieldSimulParamsSelect.setModel(getSimulParamsSelectModel()); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true)); } @Override public void clearJobDone(SimulationService simService) { } } - SimulationService.getService().addSimulationServiceListener(simulationListener); public ParamsUI(SimulAction action){ setContextValue(action); } public void refresh(){ + SimulationService.getService().removeSimulationServiceListener(simulationListener); + SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null){ fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); } @@ -281,8 +282,11 @@ Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex); } } - private ComboBoxModel getSimulParamsSelectModel() { - java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(); + protected ComboBoxModel getSimulParamsSelectModel() { + return getSimulParamsSelectModel(false); + } + protected ComboBoxModel getSimulParamsSelectModel(boolean force) { + java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(force); DefaultComboBoxModel result = new DefaultComboBoxModel(); if (items != null){ for (String s : items){ 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-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-02 16:18:21 UTC (rev 1773) @@ -441,7 +441,10 @@ return null; } public List<String> getFilteredOldSimulatorNames() { - if (oldSimulNames == null){ + return getFilteredOldSimulatorNames(false); + } + public List<String> getFilteredOldSimulatorNames(boolean force) { + if (oldSimulNames == null || force){ oldSimulNames = getOldSimulationItem(); } return oldSimulNames;