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] r2288 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Wed, 27 May 2009 18:37:09 +0200
Message-ID: <20090527163710.135A5469CD7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4565783384869275899=="

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

Author: chatellier
Date: 2009-05-27 16:37:08 +0000 (Wed, 27 May 2009)
New Revision: 2288

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nSpacializedUI.jaxx
Log:
Fix switch to non spacialized event triggered at UI init.
Improve jaxx code.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onSeasonSpacializedUI.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=
onSpacializedUI.jaxx	2009-05-27 14:54:20 UTC (rev 2287)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onSpacializedUI.jaxx	2009-05-27 16:37:08 UTC (rev 2288)
@@ -1,13 +1,30 @@
-
+<!--
+/* *##%
+ * 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, US=
A.
+ *##%*/
+ -->
+=20
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
-
     <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id=3D'populationS=
easonInfo' javaBean=3D'null'/>
=20
     <Boolean id=3D'popSeasonInfoNotNull' javaBean=3D'false'/>
-
     <Boolean id=3D'ageGroupType' javaBean=3D'false'/>
=20
     <script><![CDATA[
@@ -19,57 +36,66 @@
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 import jaxx.runtime.swing.ErrorDialogUI;
=20
-protected MatrixPanelListener listener =3D null;
+protected MatrixPanelListener matrixPanelListener;
=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 && matrixPanelPopulationSeas=
onLengthChange.getMatrix() !=3D null) {
+            // must be a copy for fire event
+            MatrixND lengthChangeMatrix =3D matrixPanelPopulationSeasonLengt=
hChange.getMatrix().copy();
+            getPopulationSeasonInfo().setLengthChangeMatrix(lengthChangeMatr=
ix);
         }
     }
 };
-public void refresh(){
-    fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener=
);
+
+public void refresh() {
+    matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelLis=
tener);
 }
-public void spacialized(){
-    getPopulationSeasonInfo().setSimpleLengthChangeMatrix(labelPopulationSea=
sonGroupChangeLengthNoSpacialized.isSelected());
+
+/**
+ * Called on spacialized radio button change.
+ */
+protected void spacializedActionPerformed() {
     PopulationSeasonInfo popInfo =3D getPopulationSeasonInfo();
+    boolean spacializedSelection =3D radioPopulationSeasonGroupChangeLengthN=
oSpacialized.isSelected();
+    popInfo.setSimpleLengthChangeMatrix(spacializedSelection);
     try {
-        MatrixND mat =3D popInfo.getLengthChangeMatrix();
-        if (mat !=3D null){
+        MatrixND lengthChangeMatrix =3D popInfo.getLengthChangeMatrix();
+        if (lengthChangeMatrix !=3D null) {
             if (popInfo.getSimpleLengthChangeMatrix()) {
-                mat =3D popInfo.unspacializeLengthChangeMatrix(mat);
+                lengthChangeMatrix =3D popInfo.unspacializeLengthChangeMatri=
x(lengthChangeMatrix);
             } else {
-                mat =3D popInfo.spacializeLengthChangeMatrix(mat);
-                popInfo.setLengthChangeMatrix(mat);
+                lengthChangeMatrix =3D popInfo.spacializeLengthChangeMatrix(=
lengthChangeMatrix);
+                popInfo.setLengthChangeMatrix(lengthChangeMatrix);
             }
         }
-    }catch(Exception eee){
-        log.error("Can't (un)spacialize Matrix Change Of Group", eee);
+    } catch(Exception eee) {
+        if (log.isErrorEnabled()) {
+            log.error("Can't (un)spacialize Matrix Change Of Group", eee);
+        }
         ErrorDialogUI.showError(eee);
     }
 }
=20
-public void computeMatrixChangeOfGroup(){
+protected void computeMatrixChangeOfGroup() {
     PopulationSeasonInfo popInfo =3D getPopulationSeasonInfo();
-    MatrixND mat =3D popInfo.computeLengthChangeMatrix();
-    if(!popInfo.getSimpleLengthChangeMatrix()){
-        mat =3D popInfo.spacializeLengthChangeMatrix(mat);
+    MatrixND lengthChangeMatrix =3D popInfo.computeLengthChangeMatrix();
+    if (!popInfo.getSimpleLengthChangeMatrix()){
+        lengthChangeMatrix =3D popInfo.spacializeLengthChangeMatrix(lengthCh=
angeMatrix);
     }
-    popInfo.setLengthChangeMatrix(mat);
+    popInfo.setLengthChangeMatrix(lengthChangeMatrix);
 }
=20
-public void showSpacializedMatrixChangeOfGroup(){
+protected void showSpacializedMatrixChangeOfGroup() {
     PopulationSeasonInfo popInfo =3D getPopulationSeasonInfo();
-    MatrixND mat =3D popInfo.getLengthChangeMatrix();
-    if(popInfo.getSimpleLengthChangeMatrix()){
-        mat =3D popInfo.spacializeLengthChangeMatrix(mat);
+    MatrixND lengthChangeMatrix =3D popInfo.getLengthChangeMatrix();
+    if (popInfo.getSimpleLengthChangeMatrix()){
+        lengthChangeMatrix =3D popInfo.spacializeLengthChangeMatrix(lengthCh=
angeMatrix);
     }
     JAXXMatrixEditor panel =3D new JAXXMatrixEditor(false, 800, 300);
-    panel.setMatrix(mat);
-    JOptionPane.showMessageDialog(null, panel, _("isisfish.message.spacializ=
ed.visualisation"), JOptionPane.INFORMATION_MESSAGE);
+    panel.setMatrix(lengthChangeMatrix);
+    JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons=
.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE);
 }
     ]]></script>
=20
@@ -79,19 +105,20 @@
                 <Panel/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JRadioButton id=3D"labelPopulationSeasonGroupChangeLengthNo=
Spacialized"
-                 buttonGroup=3D"labelPopulationSeasonGroupChangeLengthSpacia=
lizedGroup"
+                <JRadioButton id=3D"radioPopulationSeasonGroupChangeLengthNo=
Spacialized"
+                 buttonGroup=3D"radioPopulationSeasonGroupChangeLengthSpacia=
lizedGroup"
                  selected=3D'{getPopulationSeasonInfo().getSimpleLengthChang=
eMatrix()}'
-                 text=3D"isisfish.populationSeasons.noSpacialized" decorator=
=3D'boxed'
-                 enabled=3D'{isPopSeasonInfoNotNull()}' onItemStateChanged=
=3D'spacialized()'
-                 visible=3D'{isAgeGroupType()}'/>
+                 enabled=3D'{isPopSeasonInfoNotNull()}'
+                 text=3D"isisfish.populationSeasons.noSpacialized" onActionP=
erformed=3D'spacializedActionPerformed()'
+                 visible=3D'{isAgeGroupType()}' decorator=3D'boxed' />
             </cell>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JRadioButton id=3D"labelPopulationSeasonGroupChangeLengthSp=
acialized"
-                 buttonGroup=3D"labelPopulationSeasonGroupChangeLengthSpacia=
lizedGroup"
+                <JRadioButton id=3D"radioPopulationSeasonGroupChangeLengthSp=
acialized"
+                 buttonGroup=3D"radioPopulationSeasonGroupChangeLengthSpacia=
lizedGroup"
                  selected=3D'{!getPopulationSeasonInfo().getSimpleLengthChan=
geMatrix()}'
-                 text=3D"isisfish.populationSeasons.spacialized" enabled=3D'=
{isPopSeasonInfoNotNull()}'
-                 visible=3D'{isAgeGroupType()}' decorator=3D'boxed'/>
+                 enabled=3D'{isPopSeasonInfoNotNull()}'
+                 text=3D"isisfish.populationSeasons.spacialized" onActionPer=
formed=3D'spacializedActionPerformed()'
+                 visible=3D'{isAgeGroupType()}' decorator=3D'boxed' />
             </cell>
         </row>
         <row>
@@ -103,8 +130,8 @@
                 enabled=3D'{isPopSeasonInfoNotNull()}' onActionPerformed=3D'=
computeMatrixChangeOfGroup()'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JButton id=3D"labelPopulationSeasonGroupChangeLengthButtonS=
how" text=3D"isisfish.populationSeasons.showSpacialized"
-                 enabled=3D'{labelPopulationSeasonGroupChangeLengthNoSpacial=
ized.isSelected()}' decorator=3D'boxed'
+                <JButton id=3D"buttonPopulationSeasonGroupChangeLengthButton=
Show" text=3D"isisfish.populationSeasons.showSpacialized"
+                 enabled=3D'{radioPopulationSeasonGroupChangeLengthNoSpacial=
ized.isSelected()}' decorator=3D'boxed'
                  onActionPerformed=3D'showSpacializedMatrixChangeOfGroup()'
                  visible=3D'{isAgeGroupType()}'/>
             </cell>
@@ -114,10 +141,11 @@
                 <Panel/>
             </cell>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
-                <org.codelutin.math.matrix.gui.JAXXMatrixEditor id =3D'field=
PopulationSeasonReproductionDistribution'
-                matrix=3D'{getPopulationSeasonInfo() =3D=3D null ? null : ge=
tPopulationSeasonInfo().getLengthChangeMatrix()}' enabled=3D'{isPopSeasonInfo=
NotNull()}'
-                decorator=3D'boxed' _bean=3D'{PopulationSeasonInfoImpl.class=
}' _method=3D'"LengthChangeMatrix"'
-                visible=3D'{isAgeGroupType()}'/>
+                <org.codelutin.math.matrix.gui.JAXXMatrixEditor id =3D'matri=
xPanelPopulationSeasonLengthChange'
+                matrix=3D'{getPopulationSeasonInfo() =3D=3D null ? null : ge=
tPopulationSeasonInfo().getLengthChangeMatrix().copy()}'
+                enabled=3D'{isPopSeasonInfoNotNull()}'
+                _bean=3D'{PopulationSeasonInfoImpl.class}' _method=3D'"Lengt=
hChangeMatrix"'
+                visible=3D'{isAgeGroupType()}' decorator=3D'boxed' />
             </cell>
         </row>
     </Table>


--===============4565783384869275899==--