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

8 Jun 2009

Author: chatellier
Date: 2009-06-08 16:01:45 +0000 (Mon, 08 Jun 2009)
New Revision: 2343

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/PopulationCapturabilityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.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/PopulationSeasonSpacializedUI.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/PopulationZonesEditorUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
Log:
Fix all population refresh() methods (using setBean(null) tips)

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -56,11 +56,16 @@
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+    
     if (getBean() != null) {
         // TODO : Selection equation
-        if (getBean() != null){
-            if (getBean().getPopulationGroup() != null){
+        if (getBean() != null) {
+            if (getBean().getPopulationGroup() != null) {
                 jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
             }
             setTableAgeLengthModel();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -30,10 +30,9 @@
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 
 MatrixPanelListener listener = new MatrixPanelListener() {
-
     @Override
-    public void matrixChanged(MatrixPanelEvent arg0) {
-        if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){
+    public void matrixChanged(MatrixPanelEvent event) {
+        if (getBean() != null && fieldPopulationCapturability.getMatrix() != null) {
             getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy());
         }
     }
@@ -57,13 +56,20 @@
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+
     if (getBean() != null){
-         if (getBean().getCapturability() != null){
+         if (getBean().getCapturability() != null) {
             fieldPopulationCapturability.removeMatrixPanelListener(listener);
             fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy());
          }
     }
+    
+    // TODO add only once, not at all refresh
     fieldPopulationCapturability.addMatrixListener(listener);
 }
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx	2009-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -31,7 +31,12 @@
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+
     getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price);
 }
 

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -56,11 +56,16 @@
 
 @Override
 public void refresh() {
-    if (!isActif()) {
+    //if (!isActif()) {
         setPopGroupNotNull(false);
-    }
+    //}
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+
     if (getBean() != null) {
         if (getBean().getPopulationGroup() != null) {
             jaxx.runtime.SwingUtil.fillComboBox(populationGroupPopulationGroupComboBox, getBean().getPopulationGroup(), getPopulationGroup(), 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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -61,27 +61,37 @@
         remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1);
     }
 });
+
     public void init(PopulationSeasonInfo pi){
+        // add null before, for second to be considered as a changed event
+        // otherwize, setBean has no effect
+        setPopInfo(null);
         setPopInfo((PopulationSeasonInfoImpl)pi);
-         populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().clone());
+        populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().copy());
     }
+    
     @Override
     public void refresh(){
         Population population = getVerifier().getEntity(Population.class);
+
+        // setBean(null); useless here
         setBean((PopulationImpl) population);
+
         refreshPanel();
     }
+    
     @Override
     public void setActionButtons() {
 
     }
-    public void refreshPanel(){
+    
+    public void refreshPanel() {
         setFieldPopulationMigrationMigrationGroupChooserModel();
         setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
         remove.setEnabled(false);
         setAddButton();
 
-
+        // TODO add listener only once
         populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() {
             @Override
             public void matrixChanged(MatrixPanelEvent arg0) {

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -31,13 +31,19 @@
 import fr.ifremer.isisfish.entities.PopulationImpl;
 
 public void init(PopulationSeasonInfo pi) {
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setPopInfo(null);
     setPopInfo((PopulationSeasonInfoImpl)pi);
 }
 
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+
+    // setBean(null); is useless here
     setBean((PopulationImpl) population);
+
     getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);
 }
 

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -70,9 +70,13 @@
     }
 });
 
-public void init(PopulationSeasonInfo pi){
+public void init(PopulationSeasonInfo pi) {
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setPopInfo(null);
     setPopInfo((PopulationSeasonInfoImpl)pi);
-    populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone());
+
+    populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().copy());
 }
 
 @Override

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -70,15 +70,21 @@
     }
 };
 
-public void init(PopulationSeasonInfo pi){
+public void init(PopulationSeasonInfo pi) {
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setPopInfo(null);
     setPopInfo((PopulationSeasonInfoImpl)pi);
-    populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone());
+    
+    populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy());
 }
 
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+    // setBean(null); is useless here
     setBean((PopulationImpl) population);
+    
     refreshPanel();
 }
 

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -48,13 +48,19 @@
 
 @Override
 public void refresh() {
-    getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+    
     if (getBean() != null) {
         setFieldPopulationMigrationSeasonChooserModel();
     }
     useEquationChanged();
+    
+    getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
 }
 
 @Override

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -61,6 +61,10 @@
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
 
     getVerifier().addCurrentPanel(reproductionEquation);
@@ -71,6 +75,8 @@
         // chatellier : number editor is not working
         //fieldPopulationMonthGapBetweenReproRecrutement.init();
     }
+    
+    // TODO add only once
     fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
 }
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2009-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -51,6 +51,7 @@
 
 @Override
 public void refresh() {
+    // TODO add only once
     matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener);
 }
 

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-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -121,6 +121,10 @@
     }
 
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
 
     // Model instanciation

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx	2009-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -1,4 +1,22 @@
-
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, 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, USA.
+ *##%*/
+ -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
     
     <!-- bean property -->
@@ -17,26 +35,12 @@
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 
 MatrixPanelListener listener = new MatrixPanelListener() {
-
     @Override
-    public void matrixChanged(MatrixPanelEvent arg0) {
+    public void matrixChanged(MatrixPanelEvent event) {
         fieldPopulationMappingZoneReproZoneRecruChanged();
     }
 };
 
-addPropertyChangeListener("bean", new PropertyChangeListener() {
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getOldValue() != null || evt.getNewValue() == null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
-        }
-        if (evt.getNewValue() != null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
-        }
-    }
-});
-
 @Override
 public void refresh(){
     setPopulationZonesPresenceModel();
@@ -137,8 +141,6 @@
     ]]>
     </script>
     <Table id='body'>
-
-
         <row>
             <cell fill='horizontal' weightx='0.3'>
                 <JLabel text="isisfish.populationZones.selectPopulationAreas" enabled='{isActif()}'/>
@@ -173,8 +175,8 @@
             </cell>
         </row>
         <row>
-            <cell columns='3'  fill='both' weightx='1.0' weighty='0.5'>
-                <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/>
+            <cell columns='3' fill='both' weightx='1.0' weighty='0.5'>
+                <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/>
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-06-08 15:38:38 UTC (rev 2342)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-06-08 16:01:45 UTC (rev 2343)
@@ -31,7 +31,12 @@
 @Override
 public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((PopulationImpl) population);
+
     getVerifier().addCurrentPanel(popZones);
 }

    

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

chatellier＠users.labs.libre-entreprise.org