From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:26 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2742 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Thu, 05 Nov 2009 16:22:13 +0100
Message-ID: <20091105152213.980C516C32B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4036898576994601167=="

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

Author: chatellier
Date: 2009-11-05 15:22:13 +0000 (Thu, 05 Nov 2009)
New Revision: 2742

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oZoneUI.jaxx
Log:
Replace jaxx item use by list models

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSe=
asonInfoZoneUI.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/MetierSeasonIn=
foZoneUI.jaxx	2009-11-05 14:29:02 UTC (rev 2741)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foZoneUI.jaxx	2009-11-05 15:22:13 UTC (rev 2742)
@@ -27,17 +27,17 @@
     <Boolean id=3D'metierSeasonInfoNotNull' javaBean=3D'false'/>
=20
     <script><![CDATA[
+    import fr.ifremer.isisfish.entities.Metier;
+    import fr.ifremer.isisfish.entities.MetierImpl;
+    import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+    import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
     import fr.ifremer.isisfish.entities.Season;
+    import fr.ifremer.isisfish.entities.Zone;
     import fr.ifremer.isisfish.types.Month;
+    import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel;
     import fr.ifremer.isisfish.ui.widget.Interval;
-    import fr.ifremer.isisfish.entities.MetierSeasonInfo;
-    import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
     import fr.ifremer.isisfish.ui.widget.IntervalPanel;
-    import fr.ifremer.isisfish.entities.Zone;
-    import fr.ifremer.isisfish.entities.Metier;
-    import fr.ifremer.isisfish.entities.MetierImpl;
-    import jaxx.runtime.swing.Item;
-   =20
+
     protected Interval interval =3D null;
     protected boolean init =3D false;
    =20
@@ -174,16 +174,11 @@
     }
   =20
     protected void setMetierSeasonInfoCombo() {
-        java.util.List<Item> items =3D new ArrayList<Item>();
         java.util.List<MetierSeasonInfo> metierSeasonInfoList =3D getBean().=
getMetierSeasonInfo();
-        items.add(new Item("null", " ", null, false));
-        if (metierSeasonInfoList !=3D null) {
-            for (MetierSeasonInfo m : metierSeasonInfoList) {
-                items.add(new Item(m.getFirstMonth().toString() + "-" + m.ge=
tLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth(=
).toString(), m, (m =3D=3D getMetierSeasonInfo())));
-            }
-        }
-        metierSeasonInfoCombo.setItems(items);
+        MetierSeasonInfoComboModel metierSeasonInfoModel =3D new MetierSeaso=
nInfoComboModel(metierSeasonInfoList);
+        metierSeasonInfoCombo.setModel(metierSeasonInfoModel);
     }
+
     protected void metierZonesChanged(){
         Object[] selected =3D metierZones.getSelectedValues();
         java.util.List<Zone> zones =3D new ArrayList<Zone>();
@@ -211,7 +206,8 @@
                             <JLabel text=3D"isisfish.metierSeasonInfoZone.se=
lectSeason" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"metierSeasonInfoCombo" onAction=
Performed=3D'seasonChanged()' enabled=3D'{isActif()}'/>
+                            <JComboBox id=3D"metierSeasonInfoCombo" onAction=
Performed=3D'seasonChanged()' enabled=3D'{isActif()}'
+                            renderer=3D"{new fr.ifremer.isisfish.ui.input.me=
tier.MetierSeasonInfoComboRenderer()}" />
                         </cell>
                     </row>
                     <row>


--===============4036898576994601167==--