From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:46 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3302 -
	isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 29 Apr 2011 17:04:04 +0200
Message-ID: <20110429150404.CCB482F181@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8360182786651311172=="

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

Author: chatellier
Date: 2011-04-29 15:04:04 +0000 (Fri, 29 Apr 2011)
New Revision: 3302

Log:
Fix OnValueChanged

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Popula=
tionZonesEditorUI.jaxx

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/PopulationZonesEditorUI.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Popul=
ationZonesEditorUI.jaxx	2011-04-29 13:13:17 UTC (rev 3301)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Popul=
ationZonesEditorUI.jaxx	2011-04-29 15:04:04 UTC (rev 3302)
@@ -28,17 +28,20 @@
     <fr.ifremer.isisfish.entities.Population id=3D'bean' javaBean=3D'null'/>
=20
     <import>
-	fr.ifremer.isisfish.entities.Zone;
-	fr.ifremer.isisfish.ui.input.model.ZoneListModel;
-	org.nuiton.math.matrix.gui.MatrixPanelEvent;
-	org.nuiton.math.matrix.gui.MatrixPanelListener;
-	java.beans.PropertyChangeEvent;
-	java.beans.PropertyChangeListener;
+	fr.ifremer.isisfish.entities.Zone
+	fr.ifremer.isisfish.ui.input.model.ZoneListModel
+	org.nuiton.math.matrix.gui.MatrixPanelEvent
+	org.nuiton.math.matrix.gui.MatrixPanelListener
+	java.beans.PropertyChangeEvent
+	java.beans.PropertyChangeListener
+    java.util.List
     java.util.ArrayList
     java.awt.Dimension
     </import>
=20
     <script><![CDATA[
+protected boolean init =3D false;
+
 protected void $afterCompleteSetup() {
     addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
@@ -49,10 +52,12 @@
                 setFieldPopulationMappingZoneReproZoneRecru();
             }
             if (evt.getNewValue() !=3D null) {
+                init =3D true;
                 setPopulationZonesPresenceModel();
                 setFieldPopulationZonesReproductionModel(getSelectedValues(p=
opulationZonesPresence));
                 setFieldPopulationZonesRecruitmentModel(getSelectedValues(po=
pulationZonesPresence));
                 setFieldPopulationMappingZoneReproZoneRecru();
+                init =3D false;
             }
         }
     });
@@ -62,7 +67,7 @@
     getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix().clone());
 }
=20
-/*public void refresh(){
+/*public void refresh() {
     setPopulationZonesPresenceModel();
     setFieldPopulationZonesReproductionModel(getSelectedValues(populationZon=
esPresence));
     setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZone=
sPresence));
@@ -71,26 +76,26 @@
     //fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
 }*/
=20
-protected void setFieldPopulationMappingZoneReproZoneRecru(){
-    if (getBean() !=3D null){
-        if (getBean().getMappingZoneReproZoneRecru() !=3D null){
+protected void setFieldPopulationMappingZoneReproZoneRecru() {
+    if (getBean() !=3D null) {
+        if (getBean().getMappingZoneReproZoneRecru() !=3D null) {
             fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().get=
MappingZoneReproZoneRecru().copy());
         }
     }
 }
-protected void setPopulationZonesPresenceModel(){
-    if (getBean() !=3D null){
+protected void setPopulationZonesPresenceModel() {
+    if (getBean() !=3D null) {
         java.util.List<Zone> zones =3D getFisheryRegion().getZone();
         setModel(zones, getBean().getPopulationZone(), populationZonesPresen=
ce);
     }
 }
-protected void setFieldPopulationZonesReproductionModel(java.util.List<Zone>=
 zones){
-    if (getBean() !=3D null){
+protected void setFieldPopulationZonesReproductionModel(List<Zone> zones) {
+    if (getBean() !=3D null) {
         setModel(zones, getBean().getReproductionZone(), fieldPopulationZone=
sReproduction);
     }
 }
-protected void setFieldPopulationZonesRecruitmentModel(java.util.List<Zone> =
zones){
-    if (getBean() !=3D null){
+protected void setFieldPopulationZonesRecruitmentModel(List<Zone> zones) {
+    if (getBean() !=3D null) {
         setModel(zones, getBean().getRecruitmentZone(), fieldPopulationZones=
Recruitment);
     }
 }
@@ -99,7 +104,7 @@
  * Change model of {@code associatedList} with all available zones, but keep
  * selection with {@code selectedZones}.
  */
-protected void setModel(java.util.List<Zone> availableZones, java.util.List<=
Zone> selectedZones, JList associatedList){   =20
+protected void setModel(List<Zone> availableZones, List<Zone> selectedZones,=
 JList associatedList) {   =20
     ZoneListModel zoneModel =3D new ZoneListModel(availableZones);
     associatedList.setModel(zoneModel);
    =20
@@ -111,27 +116,36 @@
         }
     }
 }
-protected void presenceChanged(){
-    getBean().setPopulationZone(getSelectedValues(populationZonesPresence));
-    setFieldPopulationZonesReproductionModel(getSelectedValues(populationZon=
esPresence));
-    setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZone=
sPresence));
-    setFieldPopulationMappingZoneReproZoneRecru();
+
+protected void presenceChanged() {
+    if (!init) {
+        getBean().setPopulationZone(getSelectedValues(populationZonesPresenc=
e));
+        setFieldPopulationZonesReproductionModel(getSelectedValues(populatio=
nZonesPresence));
+        setFieldPopulationZonesRecruitmentModel(getSelectedValues(population=
ZonesPresence));
+        setFieldPopulationMappingZoneReproZoneRecru();
+    }
 }
-protected void reproductionChanged(){
-    getBean().setReproductionZone(getSelectedValues(fieldPopulationZonesRepr=
oduction));
-    setFieldPopulationMappingZoneReproZoneRecru();
+
+protected void reproductionChanged() {
+    if (!init) {
+        getBean().setReproductionZone(getSelectedValues(fieldPopulationZones=
Reproduction));
+        setFieldPopulationMappingZoneReproZoneRecru();
+    }
 }
-protected void recruitementChanged(){
-    getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesRecru=
itment));
-    setFieldPopulationMappingZoneReproZoneRecru();
+
+protected void recruitementChanged() {
+    if (!init) {
+        getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesR=
ecruitment));
+        setFieldPopulationMappingZoneReproZoneRecru();
+    }
 }
=20
 /**
  * Get selected values for components as list.
  */
-protected java.util.List<Zone> getSelectedValues(JList component){
+protected List<Zone> getSelectedValues(JList component) {
     Object[] selectedValues =3D component.getSelectedValues();
-    java.util.List<Zone> selectedZone =3D new ArrayList<Zone>();
+    List<Zone> selectedZone =3D new ArrayList<Zone>();
     for (Object value : selectedValues) {
         selectedZone.add((Zone)value);
     }


--===============8360182786651311172==--