From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:26 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2738 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input	sensitivity
 simulator
Date: Wed, 04 Nov 2009 19:14:13 +0100
Message-ID: <20091104181413.B529D16C4F2@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2366388711979689157=="

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

Author: chatellier
Date: 2009-11-04 18:14:13 +0000 (Wed, 04 Nov 2009)
New Revision: 2738

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCaptu=
rabilityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroup=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionImmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecru=
itmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nSpacializedUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
EditorUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMont=
hInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHel=
per.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixCon=
tinuousPanelUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.ja=
xx
Log:
Replace JaxxMatrixEditor by MatrixPanelEditor and use proper jaxx change even=
ts.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI=
.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/WelcomePanelUI.jaxx	=
2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx	=
2009-11-04 18:14:13 UTC (rev 2738)
@@ -18,12 +18,26 @@
  *##%*/
  -->
 <JPanel layout=3D'{new BorderLayout()}'>
-  <script>
-      <![CDATA[
-        public void setContent(Container c) {
+  <script><![CDATA[
+
+        protected WelcomeSaveVerifier getVerifier() {
+            return getContextValue(WelcomeSaveVerifier.class);
+        }
+
+        public void setContent(Component c) {
             this.add(c, BorderLayout.CENTER);
         }
=20
+        public void close(JFrame f) {
+            if (getVerifier().allIsSaved()) {
+                exit(f);
+            }
+        }
+
+        protected void exit(JFrame f) {
+            f.dispose();
+        }
+
         /**
          * Change status message and stop progress bar if running.
          *
@@ -42,20 +56,6 @@
         public void setStatusMessage(String message, boolean running) {
             statusBar.setStatusMessage(message, running);
         }
-       =20
-        public void close(JFrame f) {
-            if (getVerifier().allIsSaved()) {
-                exit(f);
-            }
-        }
-       =20
-        protected void exit(JFrame f) {
-            f.dispose();
-        }
-       =20
-        protected WelcomeSaveVerifier getVerifier() {
-            return getContextValue(WelcomeSaveVerifier.class);
-        }
      ]]>
   </script>
   <StatusBarUI id=3D'statusBar' constraints=3D"BorderLayout.SOUTH" />

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.j=
axx
=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/WelcomeTabUI.jaxx	20=
09-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx	20=
09-11-04 18:14:13 UTC (rev 2738)
@@ -25,34 +25,35 @@
         import fr.ifremer.isisfish.ui.input.InputAction;
         import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
        =20
-        // chatellier already done in SimulAction constructor
-        //simulUI.getContextValue(SimulAction.class).init();
-       =20
-        //queueUI.setContextValue(simulUI.getContextValue(SimulAction.class)=
);
-        public void selTab(int i){
-            simulTabs.setSelectedIndex(i);
+        /** Change tab selection. */
+        public void setQueueTabSelection() {
+            simulTabs.setSelectedIndex(5);
         }
-        public void refresh() {
+
+        /*public void refresh() {
             simulUI.refresh();
             sensitivityUI.refresh();
-        }
+        }*/
         ]]>
     </script>
     <JTabbedPane id=3D"simulTabs" tabPlacement=3D'{JTabbedPane.LEFT}' constr=
aints=3D"BorderLayout.CENTER">
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/book.gif"))}'>
-            <fr.ifremer.isisfish.ui.input.InputUI id=3D'inputUI' constructor=
Params=3D'new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.cl=
ass)).add(new InputAction()).add(new InputSaveVerifier()).add(this)'/>
+            <fr.ifremer.isisfish.ui.input.InputUI id=3D'inputUI'
+                constructorParams=3D'new JAXXInitialContext().add(getContext=
Value(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVer=
ifier())' />
         </tab>
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/simulation.gif"))}'>
-            <fr.ifremer.isisfish.ui.simulator.SimulUI id=3D'simulUI' constru=
ctorParams=3D'new JAXXInitialContext().add(new SimulAction()).add(this)'/>
+            <fr.ifremer.isisfish.ui.simulator.SimulUI id=3D'simulUI'
+                constructorParams=3D'new JAXXInitialContext().add(new SimulA=
ction()).add(this)' />
         </tab>
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/sensitivities.gif"))}'>
-            <fr.ifremer.isisfish.ui.sensitivity.SensitivityUI id=3D"sensitiv=
ityUI" constructorParams=3D'new JAXXInitialContext().add(new InputAction()).a=
dd(new InputSaveVerifier()).add(new SimulAction()).add(this)'/>
+            <fr.ifremer.isisfish.ui.sensitivity.SensitivityUI id=3D"sensitiv=
ityUI"
+                constructorParams=3D'new JAXXInitialContext().add(new InputA=
ction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)' />
         </tab>
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/calc.gif"))}'>
-            <fr.ifremer.isisfish.ui.result.ResultView/>
+            <fr.ifremer.isisfish.ui.result.ResultView />
         </tab>
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/bookPage.gif"))}'>
-            <fr.ifremer.isisfish.ui.script.ScriptUI/>
+            <fr.ifremer.isisfish.ui.script.ScriptUI />
         </tab>
         <tab title=3D' ' icon=3D'{new ImageIcon(getClass().getResource("/ima=
ges/Queue.gif"))}'>
             <fr.ifremer.isisfish.ui.queue.QueueUI />

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.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/WelcomeUI.jaxx	2009-=
11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2009-=
11-04 18:14:13 UTC (rev 2738)
@@ -55,15 +55,19 @@
     toolTipManager.setInitialDelay(0);
     toolTipManager.setDismissDelay(60000);
            =20
-    protected void openFrame(Container c, String title) {
+    protected void openFrame(Component c, String title) {
         JFrame f =3D new JFrame();
         f.setLayout(new BorderLayout());
-        WelcomePanelUI welcome =3D new WelcomePanelUI(new JAXXInitialContext=
().add(verifier).add(this));
+
+        JAXXInitialContext childContext =3D new JAXXInitialContext().add(ver=
ifier).add(this);
+        WelcomePanelUI welcome =3D new WelcomePanelUI(childContext);
+
         welcome.setContent(c);
         f.add(welcome, BorderLayout.CENTER);
         f.setTitle(title);
         f.setSize(new Dimension(800, 600));
         f.setDefaultCloseOperation(f.DO_NOTHING_ON_CLOSE);
+
         allFrameOpened.put(f, welcome);
         f.addWindowListener(new WindowAdapter() {
             @Override
@@ -72,6 +76,7 @@
                 allFrameOpened.get(f).close(f);
             }
         });
+        org.nuiton.widget.SwingUtil.center(f);
         f.setVisible(true);
     }
     public void close() {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onCapturabilityUI.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/PopulationCapt=
urabilityUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapt=
urabilityUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -23,20 +23,15 @@
     <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
=20
     <script><![CDATA[
-   =20
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
-MatrixPanelListener listener =3D new MatrixPanelListener() {
-    @Override
-    public void matrixChanged(MatrixPanelEvent event) {
-        if (getBean() !=3D null && fieldPopulationCapturability.getMatrix() =
!=3D null) {
-            getBean().setCapturability(fieldPopulationCapturability.getMatri=
x().copy());
-        }
+protected void populationCapturabilityMatrixChanged(MatrixPanelEvent event) {
+    if (getBean() !=3D null && fieldPopulationCapturability.getMatrix() !=3D=
 null) {
+        getBean().setCapturability(fieldPopulationCapturability.getMatrix().=
copy());
     }
-};
+}
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -64,13 +59,13 @@
=20
     if (getBean() !=3D null){
          if (getBean().getCapturability() !=3D null) {
-            fieldPopulationCapturability.removeMatrixPanelListener(listener);
+            //fieldPopulationCapturability.removeMatrixPanelListener(listene=
r);
             fieldPopulationCapturability.setMatrix(getBean().getCapturabilit=
y().copy());
          }
     }
    =20
     // TODO add only once, not at all refresh
-    fieldPopulationCapturability.addMatrixListener(listener);
+    //fieldPopulationCapturability.addMatrixListener(listener);
 }
=20
 @Override
@@ -88,9 +83,10 @@
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'0.5=
'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id =3D'fieldPop=
ulationCapturability'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id =3D'fieldPo=
pulationCapturability'
                 matrix=3D'{getBean().getCapturability() =3D=3D null ? null :=
 getBean().getCapturability().copy()}'
-                enabled=3D'{isActif()}' decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"Capturability"'/>
+                enabled=3D'{isActif()}' decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"Capturability"'
+                onMatrixChanged=3D"populationCapturabilityMatrixChanged(even=
t)" />
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onGroupUI.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/PopulationGrou=
pUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -43,7 +43,6 @@
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
 addPropertyChangeListener("populationGroup", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -177,9 +176,9 @@
                 <JLabel text=3D"isisfish.populationGroup.naturalDeathRate" e=
nabled=3D'{isPopGroupNotNull()}'/>
             </cell>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'0.5=
'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D'fieldPopu=
lationGroupNaturalDeathRate'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'fieldPop=
ulationGroupNaturalDeathRate'
                     enabled=3D'false' decorator=3D'boxed' _bean=3D'{Populati=
onImpl.class}' _method=3D'"NaturalDeathRateMatrix"' />
-                <!-- this bindings totaly break UI
+                <!-- this bindings totally break UI
                 matrix=3D'{getBean() =3D=3D null || getPopulationGroup() =3D=
=3D null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).g=
etSubMatrixOnSemantic(0, getPopulationGroup())}' -->
             </cell>
         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEmigrationUI.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/PopulationMigr=
ationEmigrationUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEmigrationUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -34,13 +34,10 @@
 import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
 import fr.ifremer.isisfish.entities.Zone;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -91,8 +88,7 @@
         remove.setEnabled(false);
         setAddButton();
=20
-        // TODO add listener only once
-        populationMigrationEmigrationTable.addMatrixListener(new MatrixPanel=
Listener() {
+        /*populationMigrationEmigrationTable.addMatrixListener(new MatrixPan=
elListener() {
             @Override
             public void matrixChanged(MatrixPanelEvent arg0) {
                 remove.setEnabled(populationMigrationEmigrationTable.getTabl=
e().getSelectedRow() !=3D -1);
@@ -100,8 +96,16 @@
                     popInfo.setMigrationMatrix(populationMigrationEmigration=
Table.getMatrix().clone());
                 }
             }
-        });
+        });*/
     }
+
+    protected void populationMigrationEmigrationMatrixChanged(MatrixPanelEve=
nt event) {
+        remove.setEnabled(populationMigrationEmigrationTable.getTable().getS=
electedRow() !=3D -1);
+        if (popInfo !=3D null){
+            popInfo.setMigrationMatrix(populationMigrationEmigrationTable.ge=
tMatrix().clone());
+        }
+    }
+
     protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
         if (getBean() !=3D null && getBean().getPopulationGroup() !=3D null){
             jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationEmig=
rationGroupChooser,getBean().getPopulationGroup(), null, true);
@@ -120,35 +124,35 @@
                 Double.parseDouble(fieldPopulationMigrationEmigrationCoeffic=
ient.getText()));
          populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigra=
tionMatrix().clone());
     }
-    protected void remove(){
+   =20
+    protected void remove() {
+        log.debug("removeEmigration called");
+        try {
+            int row =3D populationMigrationEmigrationTable.getTable().getSel=
ectedRow();
+            Object group =3D populationMigrationEmigrationTable.getTable().g=
etValueAt(row, 0);
+            Object departure =3D populationMigrationEmigrationTable.getTable=
().getValueAt(row, 1);
=20
-      log.debug("removeEmigration called");
-      try {
-          int row =3D populationMigrationEmigrationTable.getTable().getSelec=
tedRow();
-          Object group =3D populationMigrationEmigrationTable.getTable().get=
ValueAt(row, 0);
-          Object departure =3D populationMigrationEmigrationTable.getTable()=
.getValueAt(row, 1);
-
-          MatrixND mat =3D popInfo.getEmigrationMatrix().clone();
-          mat.setValue(group, departure, 0);
-          popInfo.setEmigrationMatrix(mat);
-          remove.setEnabled(false);
-      }catch(Exception eee){
-          log.error("Can't remove migration", eee);
-      }
+            MatrixND mat =3D popInfo.getEmigrationMatrix().clone();
+            mat.setValue(group, departure, 0);
+            popInfo.setEmigrationMatrix(mat);
+            remove.setEnabled(false);
+        } catch(Exception eee) {
+            log.error("Can't remove migration", eee);
+        }
     }
-    protected void groupChanged(){
+    protected void groupChanged() {
         setGPopSelected(fieldPopulationMigrationEmigrationGroupChooser.getSe=
lectedItem() !=3D null);
         setAddButton();
     }
-    protected void coefChanged(){
+    protected void coefChanged() {
         setCoefNonVide(!fieldPopulationMigrationEmigrationCoefficient.getTex=
t().equals(""));
         setAddButton();
     }
-    protected void zoneChanged(){
+    protected void zoneChanged() {
         setZoneDepartSelected(fieldPopulationMigrationEmigrationDepartureZon=
eChooser.getSelectedItem() !=3D null);
         setAddButton();
     }
-    protected void setAddButton(){
+    protected void setAddButton() {
         add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCo=
efNonVide());
     }
     ]]>
@@ -186,7 +190,9 @@
         </row>
         <row columns=3D'4'>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id =3D'populati=
onMigrationEmigrationTable' linearModel=3D"true" enabled=3D'{isActif()}'/>
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id =3D'populat=
ionMigrationEmigrationTable'
+                linearModel=3D"true" enabled=3D'{isActif()}'
+                onMatrixChanged=3D"populationMigrationEmigrationMatrixChange=
d(event)" />
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationImmigrationUI.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/PopulationMigr=
ationImmigrationUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationImmigrationUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -39,7 +39,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -61,15 +60,22 @@
         remove.setEnabled(populationMigrationImmigrationTable.getTable().get=
SelectedRow() !=3D -1);
     }
 });
-populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListene=
r() {
+
+/*populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListe=
ner() {
     @Override
     public void matrixChanged(MatrixPanelEvent arg0) {
-        if (getPopInfo() !=3D null){
+        if (getPopInfo() !=3D null) {
             getPopInfo().setImmigrationMatrix(populationMigrationImmigration=
Table.getMatrix().clone());
         }
     }
-});
+});*/
=20
+protected void populationMigrationImmigrationMatrixChanged(MatrixPanelEvent =
event) {
+    if (getPopInfo() !=3D null){
+        getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTabl=
e.getMatrix().clone());
+    }
+}
+
 public void init(PopulationSeasonInfo pi) {
     // add null before, for second to be considered as a changed event
     // otherwize, setBean has no effect
@@ -177,7 +183,9 @@
         </row>
         <row columns=3D'4'>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D'populatio=
nMigrationImmigrationTable' linearModel=3D"true" enabled=3D'{isActif()}'/>
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'populati=
onMigrationImmigrationTable'
+                linearModel=3D"true" enabled=3D'{isActif()}'
+                onMatrixChanged=3D"populationMigrationImmigrationMatrixChang=
ed(event)" />
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationMigrationUI.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/PopulationMigr=
ationMigrationUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationMigrationUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -39,7 +39,6 @@
 import fr.ifremer.isisfish.entities.Zone;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -61,15 +60,12 @@
         remove.setEnabled(populationMigrationMigrationTable.getTable().getSe=
lectedRow() !=3D -1);
     }
 });
-MatrixPanelListener listener =3D new MatrixPanelListener() {
-    @Override
-    public void matrixChanged(MatrixPanelEvent arg0) {
-        if (getPopInfo() !=3D null){
-            getPopInfo().setMigrationMatrix(populationMigrationMigrationTabl=
e.getMatrix().clone());
-        }
-    }
-};
=20
+protected void populationMigrationMigrationMatrixChanged(MatrixPanelEvent ev=
ent) {
+    if (getPopInfo() !=3D null) {
+         getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.g=
etMatrix().clone());
+    }
+}
 public void init(PopulationSeasonInfo pi) {
     // add null before, for second to be considered as a changed event
     // otherwize, setBean has no effect
@@ -100,7 +96,7 @@
     setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
     setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
=20
-    populationMigrationMigrationTable.addMatrixListener(listener);
+    //populationMigrationMigrationTable.addMatrixListener(listener);
=20
     remove.setEnabled(false);
     setAddButton();
@@ -196,7 +192,9 @@
         </row>
         <row columns=3D'4'>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-               <org.nuiton.math.matrix.gui.JAXXMatrixEditor id =3D'populatio=
nMigrationMigrationTable' linearModel=3D'{true}' enabled=3D'{isActif()}'/>
+               <org.nuiton.math.matrix.gui.MatrixPanelEditor id =3D'populati=
onMigrationMigrationTable'
+               linearModel=3D'{true}' enabled=3D'{isActif()}'
+               onMatrixChanged=3D"populationMigrationMigrationMatrixChanged(=
event)" />
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onRecruitmentUI.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/PopulationRecr=
uitmentUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecr=
uitmentUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -23,13 +23,11 @@
     <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
    =20
     <script><![CDATA[
-   =20
 import fr.ifremer.isisfish.entities.Equation;
 import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
 import jaxx.runtime.swing.editor.NumberEditor;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -47,16 +45,13 @@
     }
 });
=20
-MatrixPanelListener listener =3D new MatrixPanelListener() {
-    @Override
-    public void matrixChanged(MatrixPanelEvent event) {
-        if (getBean() !=3D null){
-            if (fieldPopulationRecruitmentDistribution.getMatrix() !=3D null=
){
-                getBean().setRecruitmentDistribution(fieldPopulationRecruitm=
entDistribution.getMatrix().copy());
-            }
+protected void populationRecruitmentDistributionMatrixChanged(MatrixPanelEve=
nt event) {
+    if (getBean() !=3D null){
+        if (fieldPopulationRecruitmentDistribution.getMatrix() !=3D null){
+            getBean().setRecruitmentDistribution(fieldPopulationRecruitmentD=
istribution.getMatrix().copy());
         }
     }
-};
+}
=20
 @Override
 public void refresh() {
@@ -77,7 +72,7 @@
     }
    =20
     // TODO add only once
-    fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
+    //fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
 }
=20
 @Override
@@ -119,9 +114,10 @@
                             <JLabel text=3D"isisfish.populationRecruitment.r=
ecruitmentDistribution" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.5'>
-                            <org.nuiton.math.matrix.gui.JAXXMatrixEditor id =
=3D'fieldPopulationRecruitmentDistribution' =20
+                            <org.nuiton.math.matrix.gui.MatrixPanelEditor id=
 =3D'fieldPopulationRecruitmentDistribution' =20
                             matrix=3D'{getBean().getRecruitmentDistribution(=
) =3D=3D null ? null : getBean().getRecruitmentDistribution().copy()}'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{PopulationImpl.class}' _method=3D'"RecruitmentDistribution"'/>
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{PopulationImpl.class}' _method=3D'"RecruitmentDistribution"'
+                            onMatrixChanged=3D"populationRecruitmentDistribu=
tionMatrixChanged(event)" />
                         </cell>
                     </row>
                     <row>

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-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onSpacializedUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -33,22 +33,16 @@
 import fr.ifremer.isisfish.ui.util.ErrorHelper;
=20
 import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.math.matrix.gui.JAXXMatrixEditor;
+import org.nuiton.math.matrix.gui.MatrixPanelEditor;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
-protected MatrixPanelListener matrixPanelListener;
-
-matrixPanelListener =3D new MatrixPanelListener() {
-    @Override
-    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);
-        }
+protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) {
+    if (getPopulationSeasonInfo() !=3D null && matrixPanelPopulationSeasonLe=
ngthChange.getMatrix() !=3D null) {
+        // must be a copy for fire event
+        MatrixND lengthChangeMatrix =3D matrixPanelPopulationSeasonLengthCha=
nge.getMatrix().copy();
+        getPopulationSeasonInfo().setLengthChangeMatrix(lengthChangeMatrix);
     }
-};
+}
=20
 /*addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListen=
er() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -64,7 +58,7 @@
 @Override
 public void refresh() {
     // TODO add only once
-    matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelLis=
tener);
+    //matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelL=
istener);
 }
=20
 @Override
@@ -110,10 +104,10 @@
 protected void showSpacializedMatrixChangeOfGroup() {
     PopulationSeasonInfo popInfo =3D getPopulationSeasonInfo();
     MatrixND lengthChangeMatrix =3D popInfo.getLengthChangeMatrix();
-    if (popInfo.getSimpleLengthChangeMatrix()){
+    if (popInfo.getSimpleLengthChangeMatrix()) {
         lengthChangeMatrix =3D popInfo.spacializeLengthChangeMatrix(lengthCh=
angeMatrix);
     }
-    JAXXMatrixEditor panel =3D new JAXXMatrixEditor(false, 800, 300);
+    MatrixPanelEditor panel =3D new MatrixPanelEditor(false, 800, 300);
     panel.setMatrix(lengthChangeMatrix);
     JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons=
.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE);
 }
@@ -161,11 +155,12 @@
                 <Panel/>
             </cell>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D'matrixPan=
elPopulationSeasonLengthChange'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'matrixPa=
nelPopulationSeasonLengthChange'
                 enabled=3D'{isPopSeasonInfoNotNull()}'
                 _bean=3D'{PopulationSeasonInfoImpl.class}' _method=3D'"Lengt=
hChangeMatrix"'
                 visible=3D'{isAgeGroupType()}' decorator=3D'boxed'
-                matrix=3D'{getPopulationSeasonInfo() =3D=3D null ? null : ge=
tPopulationSeasonInfo().getLengthChangeMatrix().copy()}' />
+                matrix=3D'{getPopulationSeasonInfo() =3D=3D null ? null : ge=
tPopulationSeasonInfo().getLengthChangeMatrix().copy()}'
+                onMatrixChanged=3D"populationSeasonLengthMatrixChanged(event=
)" />
             </cell>
         </row>
     </Table>

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-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -37,9 +37,8 @@
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
-protected MatrixPanelListener matrixPanelListener;
+//protected MatrixPanelListener matrixPanelListener;
 protected Interval seasonInterval;
=20
 protected boolean init =3D false;
@@ -104,7 +103,7 @@
     }
 });
=20
-matrixPanelListener =3D new MatrixPanelListener() {
+/*matrixPanelListener =3D new MatrixPanelListener() {
     @Override
     public void matrixChanged(MatrixPanelEvent event) {
         if (getPopulationSeasonInfo() !=3D null && fieldPopulationSeasonRepr=
oductionDistribution.getMatrix() !=3D null) {
@@ -115,8 +114,18 @@
             getPopulationSeasonInfo().setReproductionDistribution(reproducti=
onDistribution);
         }
     }
-};
+};*/
=20
+protected void populationSeasonReproductionDistributionMatrixChanged(MatrixP=
anelEvent event) {
+    if (getPopulationSeasonInfo() !=3D null && fieldPopulationSeasonReproduc=
tionDistribution.getMatrix() !=3D null) {
+        MatrixND reproductionDistribution =3D fieldPopulationSeasonReproduct=
ionDistribution.getMatrix().copy();
+        if (log.isDebugEnabled()) {
+            log.debug("Matrix ReproductionDistribution modified : " + reprod=
uctionDistribution);
+        }
+        getPopulationSeasonInfo().setReproductionDistribution(reproductionDi=
stribution);
+    }
+}
+
 @Override
 public void refresh() {
     if (!isActif()) {
@@ -143,7 +152,7 @@
     seasonIntervalPanel.setLabelRenderer(Month.MONTH);
     seasonIntervalPanel.setModel(seasonInterval);
=20
-    fieldPopulationSeasonReproductionDistribution.addMatrixListener(matrixPa=
nelListener);
+    //fieldPopulationSeasonReproductionDistribution.addMatrixListener(matrix=
PanelListener);
=20
     if(getPopulationSeasonInfo() !=3D null) {
         PopulationSeasonInfoImpl popInfo =3D getPopulationSeasonInfo();
@@ -297,11 +306,12 @@
                                     visible=3D'{getPopulationSeasonInfo().ge=
tReproduction()}'/>
                         </cell>
                         <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.2'>
-                            <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=
=3D'fieldPopulationSeasonReproductionDistribution'
+                            <org.nuiton.math.matrix.gui.MatrixPanelEditor id=
=3D'fieldPopulationSeasonReproductionDistribution'
                             matrix=3D'{getPopulationSeasonInfo() =3D=3D null=
 ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}'
                             enabled=3D'{isPopSeasonInfoNotNull()}'
                             visible=3D'{getPopulationSeasonInfo().getReprodu=
ction()}'
-                            decorator=3D'boxed' _bean=3D'{PopulationSeasonIn=
foImpl.class}' _method=3D'"ReproductionDistribution"'/>
+                            decorator=3D'boxed' _bean=3D'{PopulationSeasonIn=
foImpl.class}' _method=3D'"ReproductionDistribution"'
+                            onMatrixChanged=3D"populationSeasonReproductionD=
istributionMatrixChanged(event)" />
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onZonesEditorUI.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/PopulationZone=
sEditorUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sEditorUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -26,23 +26,27 @@
 import fr.ifremer.isisfish.entities.Zone;
 import fr.ifremer.isisfish.ui.input.population.ZoneListModel;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
=20
-MatrixPanelListener listener =3D new MatrixPanelListener() {
+/*MatrixPanelListener listener =3D new MatrixPanelListener() {
     @Override
     public void matrixChanged(MatrixPanelEvent event) {
         fieldPopulationMappingZoneReproZoneRecruChanged();
     }
-};
+};*/
=20
+protected void populationMappingZoneReproZoneRecruMatrixChanged(MatrixPanelE=
vent event) {
+    //fieldPopulationMappingZoneReproZoneRecruChanged();
+    getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix().clone());
+}
+
 @Override
 public void refresh(){
     setPopulationZonesPresenceModel();
     setFieldPopulationZonesReproductionModel(getSelectedValues(populationZon=
esPresence));
     setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZone=
sPresence));
-    fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(liste=
ner);
+    //fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(lis=
tener);
     setFieldPopulationMappingZoneReproZoneRecru();
-    fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
+    //fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
 }
=20
 @Override
@@ -50,9 +54,9 @@
=20
 }
=20
-protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
+/*protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
     getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix());
-}
+}*/
 protected void setFieldPopulationMappingZoneReproZoneRecru(){
     if (getBean() !=3D null){
         if (getBean().getMappingZoneReproZoneRecru() !=3D null){
@@ -153,7 +157,9 @@
         </row>
         <row>
             <cell columns=3D'3' fill=3D'both' weightx=3D'1.0' weighty=3D'0.5=
'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D'fieldPopu=
lationMappingZoneReproZoneRecru' constructorParams=3D'false' enabled=3D'{isAc=
tif()}'/>
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'fieldPop=
ulationMappingZoneReproZoneRecru'
+                constructorParams=3D'false' enabled=3D'{isActif()}'
+                onMatrixChanged=3D"populationMappingZoneReproZoneRecruMatrix=
Changed(event)" />
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
OneMonthInfoUI.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/StrategyOneMon=
thInfoUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -30,15 +30,14 @@
 import fr.ifremer.isisfish.entities.Strategy;
 import fr.ifremer.isisfish.entities.StrategyImpl;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import org.nuiton.math.matrix.gui.MatrixPanelListener;
 import jaxx.runtime.swing.editor.NumberEditor;
 import fr.ifremer.isisfish.entities.TripType;
=20
-protected MatrixPanelListener matrixListener;
+//protected MatrixPanelListener matrixListener;
=20
 protected int month =3D 0;
=20
-matrixListener =3D new MatrixPanelListener() {
+/*matrixListener =3D new MatrixPanelListener() {
     @Override
     public void matrixChanged(MatrixPanelEvent event) {
         if (getStrategyMonthInfo() !=3D null && fieldStrategyMonthInfoPropor=
tion.getMatrix() !=3D null) {
@@ -47,8 +46,15 @@
         }
     }
 };
-fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);
+fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);*/
=20
+protected void strategyMonthInfoProportionMatrixChanged(MatrixPanelEvent eve=
nt) {
+    if (getStrategyMonthInfo() !=3D null && fieldStrategyMonthInfoProportion=
.getMatrix() !=3D null) {
+        log.debug("Matrix modified : " + fieldStrategyMonthInfoProportion.ge=
tMatrix());
+        getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoPro=
portion.getMatrix().copy());
+    }
+}
+
 @Override
 public void refresh() {
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
@@ -147,8 +153,9 @@
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'1.=
0'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D"fieldStra=
tegyMonthInfoProportion" linearModelShowDefault=3D'{true}'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D"fieldStr=
ategyMonthInfoProportion" linearModelShowDefault=3D'{true}'
                 linearModel=3D'{true}' matrix=3D'{getStrategyMonthInfo().get=
ProportionMetier() =3D=3D null ? null : getStrategyMonthInfo().getProportionM=
etier().copy()}'
+                onMatrixChanged=3D"strategyMonthInfoProportionMatrixChanged(=
event)"
                 enabled=3D'{isActif()}' decorator=3D'boxed' _bean=3D'{fr.ifr=
emer.isisfish.entities.StrategyMonthInfoImpl.class}' _method=3D'"ProportionMe=
tier"'/>
             </cell>
         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Ed=
itorHelper.java
=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/sensitivity/EditorHe=
lper.java	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-11-04 18:14:13 UTC (rev 2738)
@@ -49,7 +49,7 @@
 import jaxx.runtime.JAXXInitialContext;
 import jaxx.runtime.swing.JAXXList;
 import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.math.matrix.gui.JAXXMatrixEditor;
+import org.nuiton.math.matrix.gui.MatrixPanelEditor;
 import org.nuiton.topia.persistence.TopiaEntity;
 import fr.ifremer.isisfish.ui.input.RangeOfValuesUI;
 import fr.ifremer.isisfish.ui.input.SelectivityEditorUI;
@@ -93,7 +93,7 @@
             } else if (result instanceof MatrixEditor) {
                 MatrixEditor ui =3D (MatrixEditor) c;
                 MatrixND m =3D (MatrixND) callMethod(e, fieldName);
-                JAXXMatrixEditor matrix =3D new JAXXMatrixEditor(false);
+                MatrixPanelEditor matrix =3D new MatrixPanelEditor(false);
                 if (m !=3D null) {
                     matrix.setMatrix(m.clone());
                 }
@@ -342,7 +342,7 @@
             } else if (result instanceof MatrixEditor) {
                 MatrixEditor ui =3D (MatrixEditor) c;
                 MatrixND m =3D (MatrixND) value;
-                JAXXMatrixEditor matrix =3D new JAXXMatrixEditor(false);
+                MatrixPanelEditor matrix =3D new MatrixPanelEditor(false);
                 if (m !=3D null) {
                     matrix.setMatrix(m.clone());
                 }
@@ -491,8 +491,8 @@
         } else if (c instanceof JTable) {
             //                ((JTable) result).setText(BeanUtils.getPropert=
y(e, fieldName));
=20
-        } else if (c instanceof JAXXMatrixEditor) {
-            result =3D ((JAXXMatrixEditor) c).getMatrix();
+        } else if (c instanceof MatrixPanelEditor) {
+            result =3D ((MatrixPanelEditor) c).getMatrix();
=20
         } else if (c instanceof JComboBox) {
             result =3D ((JComboBox) c).getSelectedItem();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Ma=
trixContinuousPanelUI.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/sensitivity/MatrixCo=
ntinuousPanelUI.jaxx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixCo=
ntinuousPanelUI.jaxx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -27,7 +27,7 @@
                 <JLabel text=3D'isisfish.factor.value' visible=3D'{isContinu=
ePossible()}' enabled=3D'{isContinueSelected()}'/>
             </cell>
             <cell fill=3D'both' weightx=3D'1' weighty=3D'1'>
-                <org.nuiton.math.matrix.gui.JAXXMatrixEditor id=3D'component=
Panel' dimensionEdit=3D'{false}'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'componen=
tPanel' dimensionEdit=3D'{false}'
                     matrix=3D'{getMatrix() =3D=3D null ? null : getMatrix().=
clone()}' visible=3D'{isContinuePossible()}'
                     enabled=3D'{isContinueSelected()}'/>
             </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Para=
msUI.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/simulator/ParamsUI.j=
axx	2009-11-04 13:46:52 UTC (rev 2737)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.j=
axx	2009-11-04 18:14:13 UTC (rev 2738)
@@ -198,15 +198,14 @@
     if (!isSensitivity()) {
         simulAction.launchSimulation(fieldSimulParamsName.getText(), (Simula=
torLauncher)comboSelLauncher.getSelectedItem());
     }
-    else{
+    else {
         simulAction.launchSimulationWhithSensibility(fieldSimulParamsName.ge=
tText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
    =20
     // dans le cas d'une fenetre independante, il n'y a pas de ParentContain=
er
     WelcomeTabUI parent =3D getParentContainer(WelcomeTabUI.class);
     if (parent !=3D null) {
-        // 5 =3D queue simulation tab
-        parent.selTab(5);
+        parent.setQueueTabSelection();
     }
 }
 protected void enablePreSimul() {
@@ -577,7 +576,7 @@
                     <cell columns=3D"4" fill=3D"both"  weightx=3D"1.0" weigh=
ty=3D"0.6">
                         <JTabbedPane id=3D"parametersTabbedPane" minimumSize=
=3D'{new Dimension(0,0)}' preferredSize=3D'{new Dimension(0,0)}'>
                             <tab title=3D'{_("isisfish.params.populationNumb=
ers")}'>
-                                <org.nuiton.math.matrix.gui.JAXXMatrixEditor=
 id=3D"simulParamsNumbers" name=3D"isisfish.params.populationNumbers"/>
+                                <org.nuiton.math.matrix.gui.MatrixPanelEdito=
r id=3D"simulParamsNumbers" name=3D"isisfish.params.populationNumbers"/>
                             </tab>
                             <tab title=3D'{_("isisfish.params.ruleParameters=
")}'>
                                 <JScrollPane  minimumSize=3D'{new Dimension(=
0,0)}' preferredSize=3D'{new Dimension(0,0)}'>


--===============2366388711979689157==--