Author: chatellier Date: 2009-06-19 09:47:02 +0000 (Fri, 19 Jun 2009) New Revision: 2408 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulation/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx Log: Add proper simulation combo model Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java 2009-06-19 09:47:02 UTC (rev 2408) @@ -0,0 +1,103 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + *##%*/ + +package fr.ifremer.isisfish.ui.models.simulation; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +/** + * Model pour la liste des simulations (leurs noms seulement). + * + * @author chatellier + * @version $Revision: 2350 $ + * + * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ + * By : $Author: chatellier $ + */ +public class SimulationNamesComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** SensitivityCalculator names. */ + protected List<String> simulationsNames; + + /** + * Empty constructor. + */ + public SimulationNamesComboModel() { + this(null); + } + + /** + * Constructor with simulation list. + * + * @param simulationsNames simulation names + */ + public SimulationNamesComboModel(List<String> simulationsNames) { + super(); + setSensitivityCalculatorNames(simulationsNames); + } + + /** + * Get simulations names. + * + * @return the simulations names + */ + public List<String> getSensitivityCalculatorNames() { + return simulationsNames; + } + + /** + * Set simulation names. + * + * @param simulationsNames the names to set + */ + public void setSensitivityCalculatorNames(List<String> simulationsNames) { + this.simulationsNames = simulationsNames; + + // default first selected + /* disable default selection + if (!sensitivityCalculatorNames.isEmpty()) { + setSelectedItem(sensitivityCalculatorNames.get(0)); + }*/ + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return simulationsNames.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (simulationsNames != null) { + size = simulationsNames.size(); + } + return size; + } +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-06-18 17:15:02 UTC (rev 2407) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-06-19 09:47:02 UTC (rev 2408) @@ -19,8 +19,6 @@ --> <Table> <script><![CDATA[ - import jaxx.runtime.swing.Item; - import java.util.List; import java.util.ArrayList; import java.io.File; import org.codelutin.util.FileUtil; @@ -29,6 +27,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + import fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel; // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; @@ -58,7 +57,7 @@ * Model de contenu de la liste des nom de simulations */ public ComboBoxModel getSensitivitySimulationModel() { - List<String> asNames = new ArrayList<String>(); + java.util.List<String> asNames = new ArrayList<String>(); for (String simulationName : SimulationStorage.getSimulationNames()) { if (simulationName.startsWith("as_")) { String masterSensitivityName = simulationName.substring(0, simulationName.lastIndexOf("_")); @@ -67,15 +66,9 @@ } } } - - List<Item> items = new ArrayList<Item>(); - items.add(new Item("null", " ", null, true)); - for (String asName : asNames) { - items.add(new Item(asName, asName, asName, true)); - } - - fieldSensitivitySimulationSelect.setItems(items); - return fieldSensitivitySimulationSelect.getModel(); + + SimulationNamesComboModel model = new SimulationNamesComboModel(asNames); + return model; } protected SimulAction getSimulAction() { @@ -93,7 +86,8 @@ if (fieldSensitivitySimulationSelect.getSelectedIndex() != -1) { try { - List<File> files = getSimulAction().getSensitivitySecondPassResults((String)fieldSensitivitySimulationSelect.getSelectedItem()); + String selectedSimulationName = (String)fieldSensitivitySimulationSelect.getSelectedItem(); + java.util.List<File> files = getSimulAction().getSensitivitySecondPassResults(selectedSimulationName); String content = ""; for(File file : files) { @@ -119,10 +113,12 @@ <JComboBox id="fieldSensitivitySimulationSelect" model='{getSensitivitySimulationModel()}' /> </cell> <cell fill="horizontal"> - <JButton id="runSecondPassButton" text='isisfish.sensitivity.secondpass' onActionPerformed='launchSecondPass(event)' enabled="{fieldSensitivitySimulationSelect.getSelectedItem() != null}" /> + <JButton id="runSecondPassButton" text='isisfish.sensitivity.secondpass' onActionPerformed='launchSecondPass(event)' + enabled="{fieldSensitivitySimulationSelect.getSelectedItem() != null}" /> </cell> <cell fill="horizontal"> - <JButton id="displaySecondPassButton" text='isisfish.sensitivity.displaysecondpass' onActionPerformed='displaySensitivitySecondPass(event)' enabled="{fieldSensitivitySimulationSelect.getSelectedItem() != null}" /> + <JButton id="displaySecondPassButton" text='isisfish.sensitivity.displaysecondpass' onActionPerformed='displaySensitivitySecondPass(event)' + enabled="{fieldSensitivitySimulationSelect.getSelectedItem() != null}" /> </cell> </row> <row>