r1841 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input - Isis-fish-commits

19 Feb 2009

Author: sletellier
Date: 2009-02-19 11:43:22 +0000 (Thu, 19 Feb 2009)
New Revision: 1841

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.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/MetierTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.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/SetOfVesselsTabsUI.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
Log:
Add first JComboBox Item null

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -70,6 +70,14 @@
     getVerifier().setDeleteButton(remove);
     Gear gear = getVerifier().getEntity(Gear.class);
     setBean((GearImpl) gear);
+    java.util.List<Object> values = new ArrayList<Object>();
+    for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())
+        values.add(value);
+    if (getBean() != null){
+        if (values != null){
+            jaxx.runtime.swing.Utils.fillComboBox(fieldGearParamType, values, getBean().getParameterName(), true);
+        }
+    }
 }
     ]]>
     </script>
@@ -114,7 +122,7 @@
                             <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='0.5'>
-                            <JComboBox id="fieldGearParamType" model='{new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())}' onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/>
+                            <JComboBox id="fieldGearParamType" onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='0.5'>
                             <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -158,6 +158,7 @@
     java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name);
     if (formules != null){
         java.util.List<Item> items = new ArrayList<Item>();
+        items.add(new Item("null", " ", null, false));
         for (Formule f : formules) {
             boolean selected = f.equals(selectedEquation);
             items.add(new Item(f.getName(), f.getName(), f, selected));
@@ -183,6 +184,13 @@
     if (getFormule() != null){
         editor.setText(getFormule().getContent());
     }
+    else {
+        try {
+            editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java"));
+        } catch (IOException ex) {
+            Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 }
     ]]>
     </script>

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-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -167,6 +167,7 @@
    protected void setCombo(){
         java.util.List<Item> items = new ArrayList<Item>();
         java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo();
+        items.add(new Item("null", " ", null, false));
         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));

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -54,7 +54,7 @@
         try {
             if (getBean() != null){
                 init = true;
-                jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear());
+                jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(),true);
                 init = false;
             }
         } catch (Exception ex) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -83,7 +83,7 @@
         growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
         if (getBean() != null){
             if (getBean().getPopulationGroup() != null){
-                jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup());
+                jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
             }
             setTableAgeLengthModel();
        }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -81,7 +81,7 @@
     setBean((PopulationImpl) population);
     if (getBean() != null){
         if (getBean().getPopulationGroup() != null){
-            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null);
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true);
         }
     }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -88,12 +88,12 @@
     }
     protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
         if (getBean() != null && getBean().getPopulationGroup() != null){
-            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null);
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null, true);
         }
     }
     protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
         if (getBean() != null && getBean().getPopulationZone() != null){
-            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null);
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true);
         }
     }
     protected void add(){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -70,7 +70,7 @@
     migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class);
     emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class);
     immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(), "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class);
-    getVerifier().addCurrentPanel(migrationEquation, emigrationEquation, immigrationEquation);
+    getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);
 }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -38,12 +38,15 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/>
 
+    <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/>
+
     <script><![CDATA[
     
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.Zone;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,8 +54,6 @@
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 
-protected PopulationSeasonInfo popInfo = null;
-
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -68,7 +69,7 @@
 });
             
 public void init(PopulationSeasonInfo pi){
-     this.popInfo = pi;
+    setPopInfo((PopulationSeasonInfoImpl)pi);
 }
 public void refresh(){
     Population population = getVerifier().getEntity(Population.class);
@@ -79,27 +80,24 @@
 
         @Override
         public void matrixChanged(MatrixPanelEvent arg0) {
-            if (popInfo != null){
-                popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix());
+            if (getPopInfo() != null){
+                getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix());
             }
         }
     });
-    if (popInfo != null){
-        populationMigrationImmigrationTable.setMatrix(popInfo.getMigrationMatrix());
-    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
     if (getBean() != null && getBean().getPopulationGroup() != null){
-             jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null);
+             jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null, true);
     }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
     if (getBean() != null && getBean().getPopulationZone() != null){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true);
     }
 }
 protected void add(){
-    getContextValue(InputAction.class).addImmigration(popInfo,
+    getContextValue(InputAction.class).addImmigration(getPopInfo(),
             (PopulationGroup) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(),
             (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(),
             Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText()));
@@ -111,9 +109,9 @@
       Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1);
       Object arrival = populationMigrationImmigrationTable.getTable().getValueAt(row, 2);
 
-      MatrixND mat = popInfo.getImmigrationMatrix().copy();
+      MatrixND mat = getPopInfo().getImmigrationMatrix().copy();
       mat.setValue(group, departure, arrival, 0);
-      popInfo.setImmigrationMatrix(mat);
+      getPopInfo().setImmigrationMatrix(mat);
       refresh();
 }
     ]]>
@@ -151,7 +149,7 @@
         </row>
         <row columns='4'>
             <cell fill='both' weightx='1.0' weighty='1.0'>
-                  <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' enabled='{isActif()}'/>
+                  <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' matrix='{getPopInfo().getImmigrationMatrix()}' enabled='{isActif()}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -36,9 +36,12 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/>
 
+    <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/>
+
     <script><![CDATA[
     
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import fr.ifremer.isisfish.entities.PopulationGroup;
@@ -50,9 +53,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-protected PopulationSeasonInfo popInfo = null;
-protected PopulationSeasonInfo pi;
-
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -67,10 +67,9 @@
     }
 });
 public void init(PopulationSeasonInfo pi){
-     this.pi = pi;
+     setPopInfo((PopulationSeasonInfoImpl)pi);
 }
 public void refresh(){
-    popInfo = pi;
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
 
@@ -81,32 +80,29 @@
 
         @Override
         public void matrixChanged(MatrixPanelEvent arg0) {
-            if (popInfo != null){
-                popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix());
+            if (getPopInfo() != null){
+                getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix());
             }
         }
     });
-    if (popInfo != null){
-        populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatrix());
-    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
     if (getBean() != null && getBean().getPopulationGroup() != null){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null, true);
     }
 }
 protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
     if (getBean() != null && getBean().getPopulationZone() != null){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true);
     }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
     if (getBean() != null && getBean().getPopulationZone() != null){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true);
     }
 }
 protected void add(){
-    getAction().addMigration(popInfo,
+    getAction().addMigration(getPopInfo(),
             (PopulationGroup) fieldPopulationMigrationMigrationGroupChooser.getSelectedItem(),
             (Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(),
             (Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(),
@@ -119,9 +115,9 @@
   Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1);
   Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2);
 
-  MatrixND mat = popInfo.getMigrationMatrix().copy();
+  MatrixND mat = getPopInfo().getMigrationMatrix().copy();
   mat.setValue(group, departure, arrival, 0);
-  popInfo.setMigrationMatrix(mat);
+  getPopInfo().setMigrationMatrix(mat);
   refresh();
 }
     ]]>
@@ -162,7 +158,7 @@
         </row>
         <row columns='4'>
             <cell fill='both' weightx='1.0' weighty='1.0'>
-                  <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' enabled='{isActif()}'/>
+                  <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' matrix='{getPopInfo().getMigrationMatrix()}' enabled='{isActif()}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -36,9 +36,12 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/>
 
+    <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/>
+
     <script><![CDATA[
 
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
@@ -68,19 +71,21 @@
     if (getBean() != null){
         setFieldPopulationMigrationSeasonChooserModel();
     }
-    PopulationSeasonInfo selected = getPopulationSeasonInfo();
-    if (selected != null){
-        fieldUseEquationMigration.setSelected(selected.getUseEquationMigration());
-        useEquationChanged();
-        populationMigrationEquationUI.init(selected);
-        populationMigrationMigrationUI.init(selected);
-        populationMigrationImmigrationUI.init(selected);
-        populationMigrationEmigrationUI.init(selected);
+}
+protected void seasonChanged(){
+    setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo());
+    if (getPopInfo() != null){
+        getVerifier().addCurrentEntity(getPopInfo());
+        populationMigrationEquationUI.init(getPopInfo());
+        populationMigrationMigrationUI.init(getPopInfo());
+        populationMigrationImmigrationUI.init(getPopInfo());
+        populationMigrationEmigrationUI.init(getPopInfo());
     }
 }
 protected void setFieldPopulationMigrationSeasonChooserModel(){
     DefaultComboBoxModel model = new DefaultComboBoxModel();
     if (getBean().getPopulationSeasonInfo() != null){
+        model.addElement(new GenericCell(" ", null, PopulationSeasonInfo.class));
         for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){
             model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class));
         }
@@ -99,6 +104,8 @@
     return result;
 }
 protected void useEquationChanged(){
+    if (getPopInfo() != null)
+        getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected());
     if (fieldUseEquationMigration.isSelected()){
         ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation");
     }
@@ -114,12 +121,12 @@
                 <JLabel text="isisfish.populationMigration.selectSeason" enabled='{isActif()}'/>
             </cell>
             <cell fill='horizontal' weightx='1.0'>
-                <JComboBox id="fieldPopulationMigrationSeasonChooser" onActionPerformed='refresh()' enabled='{isActif()}'/>
+                <JComboBox id="fieldPopulationMigrationSeasonChooser" onActionPerformed='seasonChanged()' enabled='{isActif()}'/>
             </cell>
         </row>
         <row>
             <cell columns='2' anchor='west'>
-                <JCheckBox id="fieldUseEquationMigration" selected='true' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/>
+                <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -66,7 +66,7 @@
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
 
-    reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class);
+    reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationReproductionEquation.class);
     getVerifier().addCurrentPanel(reproductionEquation);
 }
     ]]>

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-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -153,7 +153,7 @@
 }
 protected void setCombo(){
     if (getBean() != null){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null, true);
     }
 }
 protected void seasonGroupChanged(){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -72,8 +72,8 @@
     setBean((SetOfVesselsImpl) setOfVessels);
     if (getBean() != null){
         init = true;
-        jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort());
-        jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType());
+        jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
+        jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
         init=false;
         technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
         getVerifier().addCurrentPanel(technicalEfficiency);

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-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -93,7 +93,7 @@
        for (ActionListener listener : listeners){
            fieldStrategyMonthInfoTripType.removeActionListener(listener);
        }
-        jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType());
+        jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
        for (ActionListener listener : listeners){
            fieldStrategyMonthInfoTripType.addActionListener(listener);
        }

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-02-19 11:01:06 UTC (rev 1840)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-02-19 11:43:22 UTC (rev 1841)
@@ -83,7 +83,7 @@
    for (ActionListener listener : listeners){
        fieldStrategySetOfVessels.removeActionListener(listener);
    }
-  jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels());
+  jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels(), true);
    for (ActionListener listener : listeners){
        fieldStrategySetOfVessels.addActionListener(listener);
    }

    

r1841 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)