From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:10 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2283 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 26 May 2009 17:52:44 +0200
Message-ID: <20090526155244.1330E461BF7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2557437668916581623=="

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

Author: chatellier
Date: 2009-05-26 15:52:43 +0000 (Tue, 26 May 2009)
New Revision: 2283

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
Log:
Display correct distributionReproduction matrix (cut&paste ?).

Refactor all UI (beautiful variables names, etc...)

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-05-26 13:58:39 UTC (rev 2282)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-05-26 15:52:43 UTC (rev 2283)
@@ -28,16 +28,19 @@
     <Boolean id=3D'popSeasonInfoNotNull' javaBean=3D'false'/>
=20
     <script><![CDATA[
+import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import fr.ifremer.isisfish.ui.widget.Interval;
+import fr.ifremer.isisfish.ui.widget.IntervalPanel;
+import org.codelutin.math.matrix.MatrixND;
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import fr.ifremer.isisfish.ui.widget.Interval;
=20
-protected MatrixPanelListener listener =3D null;
-protected Interval interval =3D null;
+protected MatrixPanelListener matrixPanelListener =3D null;
+protected Interval seasonInterval =3D null;
=20
 protected boolean init =3D false;
 /*
@@ -45,19 +48,19 @@
  * When first is set, last value from getPopulationSeasonInfo()
  * is erased by interval.getLast() default value.
  */
-ip.addPropertyChangeListener("first", new PropertyChangeListener() {
+seasonIntervalPanel.addPropertyChangeListener("first", new PropertyChangeLis=
tener() {
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (getPopulationSeasonInfo() !=3D null) {
-            getPopulationSeasonInfo().setFirstMonth(new Month(interval.getFi=
rst()));
+            getPopulationSeasonInfo().setFirstMonth(new Month(seasonInterval=
.getFirst()));
         }
     }
 });
-ip.addPropertyChangeListener("last", new PropertyChangeListener() {
+seasonIntervalPanel.addPropertyChangeListener("last", new PropertyChangeList=
ener() {
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (getPopulationSeasonInfo() !=3D null) {
-            getPopulationSeasonInfo().setLastMonth(new Month(interval.getLas=
t()));
+            getPopulationSeasonInfo().setLastMonth(new Month(seasonInterval.=
getLast()));
         }
     }
 });
@@ -65,56 +68,54 @@
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");
             fieldPopulationSeasonComment.setText("");
             fieldPopulationSeasonReproductionDistribution.setMatrix(null);
         }
         if (evt.getNewValue() !=3D null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCe=
llName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCell=
Land.selected", "fieldCellComment.text");
+       =20
         }
     }
 });
=20
 create.addActionListener(new ActionListener() {
-
     @Override
     public void actionPerformed(ActionEvent e) {
         getContextValue(InputAction.class).createPopulationSeasonInfo(getBea=
n());
-        setCombo();
+        setPopulationSeasonInfoCombo();
     }
 });
=20
 remove.addActionListener(new ActionListener() {
-
     @Override
     public void actionPerformed(ActionEvent e) {
         getContextValue(InputAction.class).removePopulationSeasonInfo(getBea=
n(), getPopulationSeasonInfo());
-        setCombo();
+        setPopulationSeasonInfoCombo();
     }
 });
=20
 save.addActionListener(new ActionListener() {
-
     @Override
     public void actionPerformed(ActionEvent e) {
         getVerifier().topiaSave();
-        setCombo();
+        setPopulationSeasonInfoCombo();
     }
 });
=20
-listener =3D new MatrixPanelListener() {
-
+matrixPanelListener =3D new MatrixPanelListener() {
     @Override
-    public void matrixChanged(MatrixPanelEvent arg0) {
-        if (getPopulationSeasonInfo() !=3D null && fieldPopulationSeasonRepr=
oductionDistribution.getMatrix() !=3D null){
-            getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationS=
easonReproductionDistribution.getMatrix().copy());
+    public void matrixChanged(MatrixPanelEvent event) {
+        if (getPopulationSeasonInfo() !=3D null && fieldPopulationSeasonRepr=
oductionDistribution.getMatrix() !=3D null) {
+            MatrixND reproductionDistribution =3D fieldPopulationSeasonRepro=
ductionDistribution.getMatrix().copy();
+            if (log.isDebugEnabled()) {
+                log.debug("Matrix ReproductionDistribution modified : " + re=
productionDistribution);
+            }
+            getPopulationSeasonInfo().setReproductionDistribution(reproducti=
onDistribution);
         }
     }
 };
-public void refresh(){
-    if (!isActif()){
+
+public void refresh() {
+    if (!isActif()) {
         setPopSeasonInfoNotNull(false);
     }
     getVerifier().setSaveButton(save, false);
@@ -125,28 +126,30 @@
     setBean((PopulationImpl) population);
=20
     // Model instanciation
-    interval =3D new Interval();
-    interval.setMin(0);
-    interval.setMax(11);
-    interval.setFirst(0);
-    interval.setLast(2);
+    seasonInterval =3D new Interval();
+    seasonInterval.setMin(0);
+    seasonInterval.setMax(11);
+    seasonInterval.setFirst(0);
+    seasonInterval.setLast(2);
=20
-    setCombo();
-    setInterval();
+    setPopulationSeasonInfoCombo();
+    setSeasonInterval();
=20
-    ip.setLabelRenderer(Month.MONTH);
-    ip.setModel(interval);
+    seasonIntervalPanel.setLabelRenderer(Month.MONTH);
+    seasonIntervalPanel.setModel(seasonInterval);
=20
+    fieldPopulationSeasonReproductionDistribution.addMatrixListener(matrixPa=
nelListener);
+
     if(getPopulationSeasonInfo() !=3D null) {
         PopulationSeasonInfoImpl popInfo =3D getPopulationSeasonInfo();
         setPopulationSeasonInfo(null);
         setPopulationSeasonInfo(popInfo);
         getVerifier().addCurrentEntity(getPopulationSeasonInfo());
     }
-    fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener=
);
     getVerifier().addCurrentPanel(populationSeasonSpecializedUI);
 }
-protected void setInterval() {
+
+protected void setSeasonInterval() {
     if(getPopulationSeasonInfo() !=3D null) {
         try {
             if (log.isDebugEnabled()) {
@@ -155,23 +158,23 @@
             Month firstMonth =3D getPopulationSeasonInfo().getFirstMonth();
=20
             if (firstMonth !=3D null) {
-                interval.setFirst(firstMonth.getMonthNumber());
+                seasonInterval.setFirst(firstMonth.getMonthNumber());
                =20
                 if (log.isDebugEnabled()) {
-                    log.debug(" first : " + interval.getFirst());
+                    log.debug(" first : " + seasonInterval.getFirst());
                 }
             } else {
-                interval.setFirst(0);
+                seasonInterval.setFirst(0);
             }
=20
             Month lastMonth =3D getPopulationSeasonInfo().getLastMonth();
             if (lastMonth !=3D null) {
-                interval.setLast(lastMonth.getMonthNumber());
+                seasonInterval.setLast(lastMonth.getMonthNumber());
                 if (log.isDebugEnabled()) {
-                    log.debug(" last : " + interval.getLast());
+                    log.debug(" last : " + seasonInterval.getLast());
                 }
             } else {
-                interval.setLast(3);
+                seasonInterval.setLast(3);
             }
         } catch (Exception e) {
             if (log.isErrorEnabled()) {
@@ -180,29 +183,42 @@
         }
     }
 }
-protected void setCombo(){
-    if (getBean() !=3D null){
-        jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser=
,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true);
+
+protected void setPopulationSeasonInfoCombo() {
+    if (getBean() !=3D null) {
+        jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,
+            getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), =
true);
     }
 }
-protected void seasonGroupChanged(){
-    if (getPopulationSeasonInfo() !=3D null){
+
+protected void seasonGroupChanged() {
+    if (getPopulationSeasonInfo() !=3D null) {
        getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupCh=
ange.isSelected());
     }
 }
+
 protected void seasonChanged(ActionEvent event) {
     init =3D true;
-    setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonI=
nfoChooser.getSelectedItem());
-    getVerifier().addCurrentEntity(getPopulationSeasonInfo());
+    PopulationSeasonInfo seasonInfoSelected =3D (PopulationSeasonInfo)fieldP=
opulationSeasonInfoChooser.getSelectedItem();
+    if (log.isDebugEnabled()) {
+        log.debug("Season changed : " + seasonInfoSelected);
+    }
+    setPopulationSeasonInfo((PopulationSeasonInfoImpl)seasonInfoSelected);
     setPopSeasonInfoNotNull(getPopulationSeasonInfo() !=3D null);
-    setInterval();
-    setMatrix();
+    setSeasonInterval();
+    setReproductionDistributionMatrix();
+    //getVerifier().addCurrentEntity(getPopulationSeasonInfo());
     init =3D false;
 }
-protected void setMatrix(){
-    fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSea=
sonInfo().getLengthChangeMatrix());
+
+protected void setReproductionDistributionMatrix() {
+    MatrixND reproductionDistribution =3D getPopulationSeasonInfo().getRepro=
ductionDistribution();
+    fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDist=
ribution);
 }
-protected boolean isAgeGroupType(boolean result){
+
+// TODO une methode isXXX ne prend pas de parametre
+// et ne fait rien
+protected boolean isAgeGroupType(boolean result) {
     populationSeasonSpecializedUI.setVisible(result);
     return result;
 }
@@ -227,7 +243,7 @@
                             <JLabel text=3D"isisfish.common.season" enabled=
=3D'{isPopSeasonInfoNotNull()}'/>
                         </cell>
                         <cell  fill=3D'horizontal' weightx=3D'1.0'>
-                            <IntervalPanel id=3D'ip' enabled=3D'{isPopSeason=
InfoNotNull()}' decorator=3D'boxed'/>
+                            <IntervalPanel id=3D'seasonIntervalPanel' enable=
d=3D'{isPopSeasonInfoNotNull()}' decorator=3D'boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -259,13 +275,15 @@
                     </row>
                     <row>
                         <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.populationSeasons.distr=
ibutionSpawning" enabled=3D'{isPopSeasonInfoNotNull()}' visible=3D'{getPopula=
tionSeasonInfo().getReproduction()}'/>
+                            <JLabel text=3D"isisfish.populationSeasons.distr=
ibutionSpawning" enabled=3D'{isPopSeasonInfoNotNull()}'
+                                    visible=3D'{getPopulationSeasonInfo().ge=
tReproduction()}'/>
                         </cell>
                         <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.2'>
                             <org.codelutin.math.matrix.gui.JAXXMatrixEditor =
id =3D'fieldPopulationSeasonReproductionDistribution'
-                            matrix=3D'{getPopulationSeasonInfo() =3D=3D null=
 ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled=3D'{isP=
opSeasonInfoNotNull()}'
+                            matrix=3D'{getPopulationSeasonInfo() =3D=3D null=
 ? null : getPopulationSeasonInfo().getReproductionDistribution()}'
+                            enabled=3D'{isPopSeasonInfoNotNull()}'
                             visible=3D'{getPopulationSeasonInfo().getReprodu=
ction()}'
-                            decorator=3D'boxed' _bean=3D'{PopulationSeasonIn=
foImpl.class}' _method=3D'"LengthChangeMatrix"'/>
+                            decorator=3D'boxed' _bean=3D'{PopulationSeasonIn=
foImpl.class}' _method=3D'"ReproductionDistribution"'/>
                         </cell>
                     </row>
                     <row>


--===============2557437668916581623==--