[Isis-fish-commits] r1764 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

30 Jan 2009

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/EffortDescriptionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
   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/EffortDescriptionUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-01-30 12:08:08 UTC (rev 1764)
@@ -34,6 +34,7 @@
 
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.SetOfVesselsImpl id='bean' javaBean='null'/>
+
     <fr.ifremer.isisfish.entities.EffortDescriptionImpl id='effortDescription' javaBean='null'/>
 
      <script><![CDATA[
@@ -119,7 +120,7 @@
                     <row>
                         <cell fill='both' weightx='1.0' weighty='1.0'>
                             <JScrollPane>
-                                <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onMouseClicked='setEffortDescription((EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue())' enabled='{isActif()}'/>
+                                <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onMouseClicked='setEffortDescription((EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue());getVerifier().addCurrentEntity(getEffortDescription())' enabled='{isActif()}'/>
                             </JScrollPane>
                         </cell>
                     </row>
@@ -140,7 +141,7 @@
                             <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{jaxx.runtime.Util.getStringValue(getEffortDescription().getFishingOperationDuration())}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/>
+                            <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.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;
 
+    protected Interval interval = null;
     protected IntervalPanel ip = new IntervalPanel();
     displayMetierSeason.add(ip, BorderLayout.CENTER);
     ip.addPropertyChangeListener("first", new PropertyChangeListener() {
@@ -110,49 +111,64 @@
         Metier metier = getVerifier().getEntity(Metier.class);
         setBean((MetierImpl) metier);
         if (getBean() != null){
+            // Model instanciation
+            interval = new Interval();
+            interval.setMin(0);
+            interval.setMax(11);
+            interval.setFirst(0);
+            interval.setLast(2);
+
             setCombo();
-            if (getMetierSeasonInfo() != null){
-                
-                // Model instanciation
-                Interval interval = new Interval();
-                interval.setMin(0);
-                interval.setMax(11);
-                interval.setFirst(0);
-                interval.setLast(2);
+            setSeason();
+            setMetierZone();
+            
+            ip.setLabelRenderer(Month.MONTH);
+            ip.setModel(interval);
+        }
+    }
+   protected void setSeason(){
+       if (getMetierSeasonInfo() != null){
 
-                try {
-                    log.debug("************** Interval ************");
-                    Month firstMonth = getMetierSeasonInfo().getFirstMonth();
-                    if (firstMonth != null) {
-                        interval.setFirst(firstMonth.getMonthNumber());
-                        log.debug("   first : " + interval.getFirst());
-                    } else {
-                        interval.setFirst(0);
-                    }
+            try {
+                log.debug("************** Interval ************");
+                Month firstMonth = getMetierSeasonInfo().getFirstMonth();
+                if (firstMonth != null) {
+                    interval.setFirst(firstMonth.getMonthNumber());
+                    log.debug("   first : " + interval.getFirst());
+                } else {
+                    interval.setFirst(0);
+                }
 
-                    Month lastMonth = getMetierSeasonInfo().getLastMonth();
-                    if (lastMonth != 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 = getMetierSeasonInfo().getLastMonth();
+                if (lastMonth != 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(), getMetierSeasonInfo().getZone());
+            } catch (Exception e) {
+                log.error("Unexpected origin.", e);
+                // Only trace the error and go on.
             }
-        }
-    }
+       }
+   }
+   protected void setMetierZone(){
+       if (getMetierSeasonInfo() != null){
+           ListSelectionListener[] listeners = metierZones.getListSelectionListeners();
+           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 = new ArrayList<Item>();
-        java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo();
-        if (metierSeasonInfo != null){
-            for (MetierSeasonInfo m : metierSeasonInfo){
+        java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo();
+        if (metierSeasonInfoList != null){
+            for (MetierSeasonInfo m : metierSeasonInfoList){
                 items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, false));
             }
         }
@@ -175,7 +191,7 @@
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
                             <JComboBox id="fieldMetierSeasonChoice"
-                            onActionPerformed='refresh();setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);'
+                            onActionPerformed='setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);setSeason();setMetierZone();'
                             enabled='{isActif()}'/>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-01-30 09:34:10 UTC (rev 1763)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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() != null){
         try {
             log.debug("************** Interval ************");

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- 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,getRegion().getSetOfVessels(), getBean().getSetOfVessels());
+   ActionListener[] listeners = fieldStrategySetOfVessels.getActionListeners();
+   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='body'>

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

    

[Isis-fish-commits] r1764 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

sletellier＠users.labs.libre-entreprise.org