From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:51 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1764 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 30 Jan 2009 13:08:08 +0100
Message-ID: <20090130120808.ECF5E461BCC@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3546683496161409351=="

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

Author: sletellier
Date: 2009-01-30 12:08:08 +0000 (Fri, 30 Jan 2009)
New Revision: 1764

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescripti=
onUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifi=
er.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMont=
hInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.j=
axx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
Log:
Debug final - one bug left

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDe=
scriptionUI.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/EffortDescript=
ionUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescript=
ionUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -34,6 +34,7 @@
=20
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.SetOfVesselsImpl id=3D'bean' javaBean=3D'n=
ull'/>
+
     <fr.ifremer.isisfish.entities.EffortDescriptionImpl id=3D'effortDescript=
ion' javaBean=3D'null'/>
=20
      <script><![CDATA[
@@ -119,7 +120,7 @@
                     <row>
                         <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
                             <JScrollPane>
-                                <JList id=3D"fieldEffortDescriptionEffortDes=
criptionList" selectionMode=3D"0" onMouseClicked=3D'setEffortDescription((Eff=
ortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedVal=
ue())' enabled=3D'{isActif()}'/>
+                                <JList id=3D"fieldEffortDescriptionEffortDes=
criptionList" selectionMode=3D"0" onMouseClicked=3D'setEffortDescription((Eff=
ortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedVal=
ue());getVerifier().addCurrentEntity(getEffortDescription())' enabled=3D'{isA=
ctif()}'/>
                             </JScrollPane>
                         </cell>
                     </row>
@@ -140,7 +141,7 @@
                             <JLabel text=3D"isisfish.effortDescription.fishi=
ngOperationDuration" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JTextField id=3D"fieldEffortDescriptionFishingO=
perationDuration" text=3D'{jaxx.runtime.Util.getStringValue(getEffortDescript=
ion().getFishingOperationDuration())}' onKeyReleased=3D'getEffortDescription(=
).setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDesc=
riptionFishingOperationDuration.getText())))' enabled=3D'{isActif()}'/>
+                            <JTextField id=3D"fieldEffortDescriptionFishingO=
perationDuration" text=3D'{getEffortDescription().getFishingOperationDuration=
() =3D=3D null ? "" : getEffortDescription().getFishingOperationDuration().ge=
tHour()}' onKeyReleased=3D'getEffortDescription().setFishingOperationDuration=
(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDurati=
on.getText())))' enabled=3D'{isActif()}'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSav=
eVerifier.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/InputSaveVerif=
ier.java	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-01-30 12:08:08 UTC (rev 1764)
@@ -295,6 +295,7 @@
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     topiaChanged();
+                    System.out.println(evt.getSource());
                 }
             });
             this.currentEntities.add(currentEntity);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSe=
asonInfoSpeciesUI.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=
foSpeciesUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -153,7 +153,18 @@
     }
 }
 protected void remove(){
-    refresh();
+    Object season =3D ((GenericCell)fieldMetierSeasonInfo.getSelectedItem())=
.getValue();
+    if (season !=3D null){
+        MetierSeasonInfo m =3D (MetierSeasonInfo) season;
+        Object[] targetSpecies =3D m.getSpeciesTargetSpecies().toArray();
+
+        Object o =3D targetSpecies[tableTargetSpecies.getSelectedRow() + 1];
+        if (o !=3D null){
+            TargetSpecies ts =3D (TargetSpecies)o;
+            getAction().removeTargetSpecies(m, ts);
+            refresh();
+        }
+    }
 }
 protected void metierSeasonChanged(){
     setTableTargetSpeciesModel();

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-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foZoneUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -52,6 +52,7 @@
     import fr.ifremer.isisfish.entities.MetierImpl;
     import jaxx.runtime.swing.Item;
=20
+    protected Interval interval =3D null;
     protected IntervalPanel ip =3D new IntervalPanel();
     displayMetierSeason.add(ip, BorderLayout.CENTER);
     ip.addPropertyChangeListener("first", new PropertyChangeListener() {
@@ -110,49 +111,64 @@
         Metier metier =3D getVerifier().getEntity(Metier.class);
         setBean((MetierImpl) metier);
         if (getBean() !=3D null){
+            // Model instanciation
+            interval =3D new Interval();
+            interval.setMin(0);
+            interval.setMax(11);
+            interval.setFirst(0);
+            interval.setLast(2);
+
             setCombo();
-            if (getMetierSeasonInfo() !=3D null){
-               =20
-                // Model instanciation
-                Interval interval =3D new Interval();
-                interval.setMin(0);
-                interval.setMax(11);
-                interval.setFirst(0);
-                interval.setLast(2);
+            setSeason();
+            setMetierZone();
+           =20
+            ip.setLabelRenderer(Month.MONTH);
+            ip.setModel(interval);
+        }
+    }
+   protected void setSeason(){
+       if (getMetierSeasonInfo() !=3D null){
=20
-                try {
-                    log.debug("************** Interval ************");
-                    Month firstMonth =3D getMetierSeasonInfo().getFirstMonth=
();
-                    if (firstMonth !=3D null) {
-                        interval.setFirst(firstMonth.getMonthNumber());
-                        log.debug("   first : " + interval.getFirst());
-                    } else {
-                        interval.setFirst(0);
-                    }
+            try {
+                log.debug("************** Interval ************");
+                Month firstMonth =3D getMetierSeasonInfo().getFirstMonth();
+                if (firstMonth !=3D null) {
+                    interval.setFirst(firstMonth.getMonthNumber());
+                    log.debug("   first : " + interval.getFirst());
+                } else {
+                    interval.setFirst(0);
+                }
=20
-                    Month lastMonth =3D getMetierSeasonInfo().getLastMonth();
-                    if (lastMonth !=3D null) {
-                        interval.setLast(lastMonth.getMonthNumber());
-                        log.debug("   last : " + interval.getLast());
-                    } else {
-                        interval.setLast(3);
-                    }
-                } catch (Exception e) {
-                    log.error("Unexpected origin.", e);
-                    // Only trace the error and go on.
+                Month lastMonth =3D getMetierSeasonInfo().getLastMonth();
+                if (lastMonth !=3D null) {
+                    interval.setLast(lastMonth.getMonthNumber());
+                    log.debug("   last : " + interval.getLast());
+                } else {
+                    interval.setLast(3);
                 }
-                ip.setLabelRenderer(Month.MONTH);
-                ip.setModel(interval);
-
-                metierZones.fillList(getRegion().getZone(), getMetierSeasonI=
nfo().getZone());
+            } catch (Exception e) {
+                log.error("Unexpected origin.", e);
+                // Only trace the error and go on.
             }
-        }
-    }
+       }
+   }
+   protected void setMetierZone(){
+       if (getMetierSeasonInfo() !=3D null){
+           ListSelectionListener[] listeners =3D metierZones.getListSelectio=
nListeners();
+           for (ListSelectionListener listener : listeners){
+               metierZones.removeListSelectionListener(listener);
+           }
+           metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo()=
.getZone());
+           for (ListSelectionListener listener : listeners){
+               metierZones.addListSelectionListener(listener);
+           }
+       }
+   }
    protected void setCombo(){
         java.util.List<Item> items =3D new ArrayList<Item>();
-        java.util.List<MetierSeasonInfo> metierSeasonInfo =3D getBean().getM=
etierSeasonInfo();
-        if (metierSeasonInfo !=3D null){
-            for (MetierSeasonInfo m : metierSeasonInfo){
+        java.util.List<MetierSeasonInfo> metierSeasonInfoList =3D getBean().=
getMetierSeasonInfo();
+        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, false));
             }
         }
@@ -175,7 +191,7 @@
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
                             <JComboBox id=3D"fieldMetierSeasonChoice"
-                            onActionPerformed=3D'refresh();setMetierSeasonIn=
fo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifi=
er().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMe=
tierSeasonInfo() !=3D null);'
+                            onActionPerformed=3D'setMetierSeasonInfo((Metier=
SeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCu=
rrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeason=
Info() !=3D null);setSeason();setMetierZone();'
                             enabled=3D'{isActif()}'/>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onSeasonsUI.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/PopulationSeas=
onsUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -124,7 +124,6 @@
     interval.setMax(11);
     interval.setFirst(0);
     interval.setLast(2);
-    ip.setModel(interval);
     if(getPopulationSeasonInfo() !=3D null){
         try {
             log.debug("************** Interval ************");

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
OneMonthInfoUI.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/StrategyOneMon=
thInfoUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -80,6 +80,7 @@
     setBean((StrategyImpl) strategy);
     if (getBean() !=3D null){
         setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMon=
thInfo(month));
+        getVerifier().addCurrentEntity(getStrategyMonthInfo());
     }
     if (getStrategyMonthInfo() !=3D null){
         jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType=
,getRegion().getTripType(), getStrategyMonthInfo().getTripType());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
TabUI.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/StrategyTabUI.=
jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -78,7 +78,14 @@
     }
 }
 protected void setSetOfVesselsModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegio=
n().getSetOfVessels(), getBean().getSetOfVessels());
+   ActionListener[] listeners =3D fieldStrategySetOfVessels.getActionListene=
rs();
+   for (ActionListener listener : listeners){
+       fieldStrategySetOfVessels.removeActionListener(listener);
+   }
+  jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion(=
).getSetOfVessels(), getBean().getSetOfVessels());
+   for (ActionListener listener : listeners){
+       fieldStrategySetOfVessels.addActionListener(listener);
+   }
 }
     ]]></script>
     <Table id=3D'body'>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.j=
axx
=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/ZoneUI.jaxx	20=
09-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	20=
09-01-30 12:08:08 UTC (rev 1764)
@@ -95,7 +95,9 @@
     refreshMap();
 }
 protected void setZoneCells(){
-    zoneCells.fillList(getRegion().getCell(), getBean() =3D=3D null ? null :=
 getBean().getCell());
+    if (getBean() !=3D null){
+        zoneCells.fillList(getRegion().getCell(), getBean().getCell());
+    }
 }
 protected void setMapListener(){
     if (mapListener =3D=3D null){


--===============3546683496161409351==--