Author: chatellier Date: 2009-11-02 16:27:43 +0000 (Mon, 02 Nov 2009) New Revision: 2729 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx Log: Utilisation des combo model pour les populations Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-11-02 16:27:43 UTC (rev 2729) @@ -27,7 +27,6 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> <script><![CDATA[ -import javax.swing.table.DefaultTableModel; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; @@ -36,8 +35,8 @@ import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; +import fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; selectivityTable.addMouseListener(new MouseAdapter() { @Override @@ -115,23 +114,22 @@ protected DefaultComboBoxModel getSelectivityPopulationModel() { java.util.List<Species> species = getRegion().getSpecies(); - DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); + java.util.List<Population> populations = new ArrayList<Population>(); if (species != null) { - selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); for (Species s : species) { if (s.getPopulation() != null) { - for (Population p : s.getPopulation()) { - selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); - } + populations.addAll(s.getPopulation()); } } } + PopulationComboModel selectivityPopulationModel = new PopulationComboModel(populations); return selectivityPopulationModel; } protected void selectivityChanged() { setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); - setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); + // FIXME remove Impl reference + setPopulation((PopulationImpl)fieldSelectivityPopulation.getSelectedItem()); addSelectivityButton.setEnabled(isSelectivityPopulationSelected()); } ]]></script> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java 2009-11-02 16:27:43 UTC (rev 2729) @@ -0,0 +1,77 @@ +/* *##% + * 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.input.gear; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.Population; + +/** + * Model pour la liste des {@link Population}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class PopulationComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Population list */ + protected List<Population> populations; + + /** + * Constructor with species list. + * + * @param populations populations list + */ + public PopulationComboModel(List<Population> populations) { + super(); + this.populations = populations; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return populations.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (populations != null) { + size = populations.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"