From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:25 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2726 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: .	population
Date: Mon, 02 Nov 2009 16:57:12 +0100
Message-ID: <20091102155712.B6CAC16C00E@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6764238904068136675=="

--===============6764238904068136675==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-11-02 15:57:12 +0000 (Mon, 02 Nov 2009)
New Revision: 2726

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Zone=
ListModel.java
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
EditorUI.jaxx
Log:
Utilisation des list model pour les zones

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onZonesEditorUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sEditorUI.jaxx	2009-11-02 15:51:03 UTC (rev 2725)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sEditorUI.jaxx	2009-11-02 15:57:12 UTC (rev 2726)
@@ -23,14 +23,8 @@
     <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
=20
     <script><![CDATA[
-
-import jaxx.runtime.swing.JAXXList;
 import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.PopulationImpl;
-import org.nuiton.topia.persistence.TopiaEntity;
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
+import fr.ifremer.isisfish.ui.input.population.ZoneListModel;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
 import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
@@ -44,8 +38,8 @@
 @Override
 public void refresh(){
     setPopulationZonesPresenceModel();
-    setFieldPopulationZonesReproductionModel(getSelectedValue(populationZone=
sPresence));
-    setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZones=
Presence));
+    setFieldPopulationZonesReproductionModel(getSelectedValues(populationZon=
esPresence));
+    setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZone=
sPresence));
     fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(liste=
ner);
     setFieldPopulationMappingZoneReproZoneRecru();
     fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
@@ -82,59 +76,42 @@
         setModel(zones, getBean().getRecruitmentZone(), fieldPopulationZones=
Recruitment);
     }
 }
-protected void setModel(java.util.List<Zone> zones, java.util.List<Zone> sel=
ected, JAXXList componant){
-    DefaultListModel model =3D new DefaultListModel();
-    java.util.List<GenericCell> selectedZones =3D new ArrayList<GenericCell>=
();
-    if (zones !=3D null){
-        for (Zone z : zones){
-            GenericCell cell =3D new GenericCell(z.getName(), z, Zone.class);
-            model.addElement(cell);
-            if (selected !=3D null){
-                if (selected.contains(z)){
-                    selectedZones.add(cell);
-                }
-            }
-        }
+
+/**
+ * Change model of {@code associatedList} with all available zones, but keep
+ * selection with {@code selectedZones}.
+ */
+protected void setModel(java.util.List<Zone> availableZones, java.util.List<=
Zone> selectedZones, JList associatedList){   =20
+    ZoneListModel zoneModel =3D new ZoneListModel(availableZones);
+    associatedList.setModel(zoneModel);
+    for (Zone selectedZone : selectedZones) {
+        int index =3D availableZones.indexOf(selectedZone);
+        associatedList.addSelectionInterval(index, index);
     }
-    componant.setModel(model);
-    if (selectedZones.size() > 0){
-        java.util.List <Integer> indicesList =3D new ArrayList<Integer>();
-        for (GenericCell c : selectedZones){
-            indicesList.add(model.indexOf(c));
-        }
-        int[] indices =3D new int[indicesList.size()];
-        int cnt =3D 0;
-        for (Integer i : indicesList){
-            indices[cnt]=3Di;
-            cnt ++;
-        }
-        componant.setSelectedIndices(indices);
-    }
 }
 protected void presenceChanged(){
-    getBean().setPopulationZone(getSelectedValue(populationZonesPresence));
-    setFieldPopulationZonesReproductionModel(getSelectedValue(populationZone=
sPresence));
-    setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZones=
Presence));
+    getBean().setPopulationZone(getSelectedValues(populationZonesPresence));
+    setFieldPopulationZonesReproductionModel(getSelectedValues(populationZon=
esPresence));
+    setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZone=
sPresence));
     setFieldPopulationMappingZoneReproZoneRecru();
 }
 protected void reproductionChanged(){
-    getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesRepro=
duction));
+    getBean().setReproductionZone(getSelectedValues(fieldPopulationZonesRepr=
oduction));
     setFieldPopulationMappingZoneReproZoneRecru();
 }
 protected void recruitementChanged(){
-    getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecrui=
tment));
+    getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesRecru=
itment));
     setFieldPopulationMappingZoneReproZoneRecru();
 }
-protected java.util.List<Zone> getSelectedValue(JAXXList componant){
-    Object[] selected =3D componant.getSelectedValues();
+
+/**
+ * Get selected values for components as list.
+ */
+protected java.util.List<Zone> getSelectedValues(JList component){
+    Object[] selectedValues =3D component.getSelectedValues();
     java.util.List<Zone> selectedZone =3D new ArrayList<Zone>();
-    if (selected !=3D null){
-        for (Object i : selected){
-            GenericCell cell =3D (GenericCell)i;
-            if (cell.getValue() !=3D null){
-                selectedZone.add((Zone)cell.getValue());
-            }
-        }
+    for (Object value : selectedValues) {
+        selectedZone.add((Zone)value);
     }
     return selectedZone;
 }

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/=
ZoneListModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Zon=
eListModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Zon=
eListModel.java	2009-11-02 15:57:12 UTC (rev 2726)
@@ -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, US=
A.
+ *##%*/
+
+package fr.ifremer.isisfish.ui.input.population;
+
+import java.util.List;
+
+import javax.swing.DefaultListModel;
+
+import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+import fr.ifremer.isisfish.entities.Zone;
+
+/**
+ * Model pour la liste des {@link MetierSeasonInfo}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author: chatellier $
+ */
+public class ZoneListModel extends DefaultListModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 6171850179969290032L;
+
+    /** Zones list */
+    protected List<Zone> zones;
+
+    /**
+     * Constructor with species list.
+     *=20
+     * @param zones zones list
+     */
+    public ZoneListModel(List<Zone> zones) {
+        super();
+        this.zones =3D zones;
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return zones.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (zones !=3D null) {
+            size =3D zones.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/population/ZoneListModel.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL"


--===============6764238904068136675==--