Author: chatellier Date: 2009-04-21 10:18:03 +0000 (Tue, 21 Apr 2009) New Revision: 2129 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Refresh sensitivity export list after old simulation reloading. 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-21 10:02:06 UTC (rev 2128) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-21 10:18:03 UTC (rev 2129) @@ -264,7 +264,10 @@ clearExportsButton.setEnabled(false); } - protected void setExportListModel() { + /** + * Set model (refresh export Jlist). + */ + public void setExportListModel() { java.util.List<SensitivityExport> exports = getSimulAction().getSensitivityExportList(); DefaultListModel model = new DefaultListModel(); 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-04-21 10:02:06 UTC (rev 2128) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-21 10:18:03 UTC (rev 2129) @@ -16,46 +16,25 @@ * 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. - *##%*/ - -/** - * ParamsUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> + *##%*/ --> + <Table> - <!-- ui state when editing --> <Boolean id='sensitivity' javaBean='false'/> <script><![CDATA[ -import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.Common; -import fr.ifremer.isisfish.datastore.RuleStorage; -import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.WelcomeTabUI; -import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.rule.Rule; -import org.codelutin.math.matrix.gui.JAXXMatrixEditor; import javax.swing.table.DefaultTableModel; import java.text.ParseException; import java.awt.event.ItemEvent; import javax.swing.table.TableModel; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import javax.swing.table.TableColumn; import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; -import static javax.swing.JOptionPane.showMessageDialog; import javax.swing.text.JTextComponent; import org.dom4j.DocumentHelper; import org.dom4j.Element; @@ -67,8 +46,11 @@ import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer; import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + +// instances variables déclaration SimulationServiceListener simulationListener; +// end constructor code simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { @@ -84,14 +66,14 @@ } } -public ParamsUI(SimulAction action){ +public ParamsUI(SimulAction action) { setContextValue(action); } -public void refresh(){ +public void refresh() { SimulationService.getService().removeSimulationServiceListener(simulationListener); SimulationService.getService().addSimulationServiceListener(simulationListener); - if (getContextValue(SimulAction.class).getSimulationStorage() != null){ + if (getContextValue(SimulAction.class).getSimulationStorage() != null) { fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); } fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription()); @@ -99,12 +81,12 @@ setListSimulParamsPopulationsItems(); setRulesItems(); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); - if (!isSensitivity()){ - if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){ + if (!isSensitivity()) { + if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()) { SimulUI simul = getParentContainer(SimulUI.class); simul.enablePreSimul(); } - if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){ + if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()) { SimulUI simul = getParentContainer(SimulUI.class); simul.enableAnalysePlan(); } @@ -131,7 +113,7 @@ } } } -protected void setFactorRegion(){ +protected void setFactorRegion() { if (isSensitivity()){ try { getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); @@ -143,23 +125,24 @@ } } } -protected void setFactor(){ +protected void setFactor() { if (isSensitivity()){ getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFactorModel(); } } -protected void setExportSens(){ - if (isSensitivity()){ +protected void setExportSens() { + if (isSensitivity()) { + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setExportListModel(); } } -protected void setSensibilities(){ +protected void setSensibilities() { if (isSensitivity()){ } } public void setSimulationParameter(SimulAction simulAction){ getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); } -protected void loadOldSimulation(){ +protected void loadOldSimulation() { final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut if (selected != null && !selected.equals(" ")){