From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:58 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1982 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input	sensitivity
Date: Tue, 17 Mar 2009 15:14:48 +0100
Message-ID: <20090317141448.B284E461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4622650445607752747=="

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

Author: sletellier
Date: 2009-03-17 14:14:48 +0000 (Tue, 17 Mar 2009)
New Revision: 1982

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
EditorUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
UI.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/FactorWiz=
ard.jaxx
Log:
Factor of PopulationZone is done

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onUI.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/PopulationUI.j=
axx	2009-03-17 13:33:34 UTC (rev 1981)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.j=
axx	2009-03-17 14:14:48 UTC (rev 1982)
@@ -72,7 +72,7 @@
                 <PopulationEquationUI id=3D'populationEquationUI' constructo=
rParams=3D'this'/>
             </tab>
             <tab title=3D'{_("isisfish.populationZones.title")}'>
-                <PopulationZonesUI id=3D'populationZoneUI' constructorParams=
=3D'this' decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _method=3D'"Ma=
ppingZoneReproZoneRecru"'/>
+                <PopulationZonesUI id=3D'populationZoneUI' constructorParams=
=3D'this'/>
             </tab>
             <tab title=3D'{_("isisfish.populationSeasons.title")}'>
                 <PopulationSeasonsUI id=3D'populationSeasonsUI' constructorP=
arams=3D'this'/>

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZ=
onesEditorUI.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	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sEditorUI.jaxx	2009-03-17 14:14:48 UTC (rev 1982)
@@ -0,0 +1,172 @@
+
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+   =20
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
+
+    <script><![CDATA[
+
+import jaxx.runtime.swing.JAXXList;
+import fr.ifremer.isisfish.entities.Zone;
+import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+import fr.ifremer.isisfish.entities.Population;
+import fr.ifremer.isisfish.entities.PopulationImpl;
+import org.codelutin.topia.persistence.TopiaEntity;
+import fr.ifremer.isisfish.ui.WelcomePanelUI;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
+
+MatrixPanelListener listener =3D new MatrixPanelListener() {
+
+    @Override
+    public void matrixChanged(MatrixPanelEvent arg0) {
+        fieldPopulationMappingZoneReproZoneRecruChanged();
+    }
+};
+
+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");
+        }
+        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");
+        }
+    }
+});
+
+public void refresh(){
+    setPopulationZonesPresenceModel();
+    setFieldPopulationZonesReproductionModel();
+    setFieldPopulationZonesRecruitmentModel();
+    fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(liste=
ner);
+    setFieldPopulationMappingZoneReproZoneRecru();
+    fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
+}
+protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
+    getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix());
+}
+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){
+        setModel(getBean().getPopulationZone(), populationZonesPresence);
+    }
+}
+protected void setFieldPopulationZonesReproductionModel(){
+    if (getBean() !=3D null){
+        setModel(getBean().getReproductionZone(), fieldPopulationZonesReprod=
uction);
+    }
+}
+protected void setFieldPopulationZonesRecruitmentModel(){
+    if (getBean() !=3D null){
+        setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruit=
ment);
+    }
+}
+protected void setModel(java.util.List<Zone> selected, JAXXList componant){
+    DefaultListModel model =3D new DefaultListModel();
+    java.util.List<Zone> zones =3D getRegion().getZone();
+    java.util.List<GenericCell> selectedZones =3D new ArrayList<GenericCell>=
();
+    if (zones !=3D null){
+        for (Zone z : zones){
+            GenericCell cell =3D new GenericCell(z.getName(), z, Zone.class);
+            model.addElement(cell);
+            if (selected !=3D null){
+                if (selected.contains(z)){
+                    selectedZones.add(cell);
+                }
+            }
+        }
+    }
+    componant.setModel(model);
+    if (selectedZones.size() > 0){
+        java.util.List <Integer> indicesList =3D new ArrayList<Integer>();
+        for (GenericCell c : selectedZones){
+            indicesList.add(model.indexOf(c));
+        }
+        int[] indices =3D new int[indicesList.size()];
+        int cnt =3D 0;
+        for (Integer i : indicesList){
+            indices[cnt]=3Di;
+            cnt ++;
+        }
+        componant.setSelectedIndices(indices);
+    }
+}
+protected void presenceChanged(){
+    getBean().setPopulationZone(getSelectedValue(populationZonesPresence));
+    setFieldPopulationMappingZoneReproZoneRecru();
+}
+protected void reproductionChanged(){
+    getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesRepro=
duction));
+    setFieldPopulationMappingZoneReproZoneRecru();
+}
+protected void recruitementChanged(){
+    getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecrui=
tment));
+    setFieldPopulationMappingZoneReproZoneRecru();
+}
+protected java.util.List<Zone> getSelectedValue(JAXXList componant){
+    Object[] selected =3D componant.getSelectedValues();
+    java.util.List<Zone> selectedZone =3D new ArrayList<Zone>();
+    if (selected !=3D null){
+        for (Object i : selected){
+            GenericCell cell =3D (GenericCell)i;
+            if (cell.getValue() !=3D null){
+                selectedZone.add((Zone)cell.getValue());
+            }
+        }
+    }
+    return selectedZone;
+}
+    ]]>
+    </script>
+    <Table id=3D'body'>
+
+
+        <row>
+            <cell fill=3D'horizontal' weightx=3D'0.3'>
+                <JLabel text=3D"isisfish.populationZones.selectPopulationAre=
as" enabled=3D'{isActif()}'/>
+            </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.3'>
+                <JLabel text=3D"isisfish.populationZones.selectSpawningAreas=
" enabled=3D'{isActif()}'/>
+            </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.3'>
+                <JLabel text=3D"isisfish.populationZones.selectRecruitmentAr=
eas" enabled=3D'{isActif()}'/>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
+                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
+                    <JList id=3D"populationZonesPresence" onMouseClicked=3D'=
presenceChanged()' enabled=3D'{isActif()}'/>
+                </JScrollPane>
+            </cell>
+            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
+                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
+                    <JList id=3D"fieldPopulationZonesReproduction" onMouseCl=
icked=3D'reproductionChanged()' enabled=3D'{isActif()}'/>
+                </JScrollPane>
+            </cell>
+            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
+                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
+                    <JList id=3D"fieldPopulationZonesRecruitment" onMouseCli=
cked=3D'recruitementChanged()' enabled=3D'{isActif()}'/>
+                </JScrollPane>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D'3' anchor=3D'west'>
+                <JLabel text=3D"isisfish.populationZones.betweenSpawningRecr=
uitmentAreas" enabled=3D'{isActif()}'/>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D'3'  fill=3D'both' weightx=3D'1.0' weighty=3D'0.=
5'>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id =3D'fiel=
dPopulationMappingZoneReproZoneRecru' enabled=3D'{isActif()}'/>
+            </cell>
+        </row>
+    </Table>
+</fr.ifremer.isisfish.ui.input.InputContentUI>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onZonesUI.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=
sUI.jaxx	2009-03-17 13:33:34 UTC (rev 1981)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sUI.jaxx	2009-03-17 14:14:48 UTC (rev 1982)
@@ -38,172 +38,26 @@
=20
     <script><![CDATA[
=20
-import jaxx.runtime.swing.JAXXList;
-import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
-import org.codelutin.topia.persistence.TopiaEntity;
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
-import org.codelutin.math.matrix.gui.MatrixPanelEvent;
-import org.codelutin.math.matrix.gui.MatrixPanelListener;
=20
-MatrixPanelListener listener =3D new MatrixPanelListener() {
-
-    @Override
-    public void matrixChanged(MatrixPanelEvent arg0) {
-        fieldPopulationMappingZoneReproZoneRecruChanged();
-    }
-};
-
-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");
-        }
-        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");
-        }
-    }
-});
-
 public void refresh(){
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     Population population =3D getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    setPopulationZonesPresenceModel();
-    setFieldPopulationZonesReproductionModel();
-    setFieldPopulationZonesRecruitmentModel();
-    fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(liste=
ner);
-    setFieldPopulationMappingZoneReproZoneRecru();
-    fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
+    getVerifier().addCurrentPanel(popZones);
 }
-protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
-    getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix().copy());
-}
-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){
-        setModel(getBean().getPopulationZone(), populationZonesPresence);
-    }
-}
-protected void setFieldPopulationZonesReproductionModel(){
-    if (getBean() !=3D null){
-        setModel(getBean().getReproductionZone(), fieldPopulationZonesReprod=
uction);
-    }
-}
-protected void setFieldPopulationZonesRecruitmentModel(){
-    if (getBean() !=3D null){
-        setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruit=
ment);
-    }
-}
-protected void setModel(java.util.List<Zone> selected, JAXXList componant){
-    DefaultListModel model =3D new DefaultListModel();
-    java.util.List<Zone> zones =3D getRegion().getZone();
-    java.util.List<GenericCell> selectedZones =3D new ArrayList<GenericCell>=
();
-    if (zones !=3D null){
-        for (Zone z : zones){
-            GenericCell cell =3D new GenericCell(z.getName(), z, Zone.class);
-            model.addElement(cell);
-            if (selected !=3D null){
-                if (selected.contains(z)){
-                    selectedZones.add(cell);
-                }
-            }
-        }
-    }
-    componant.setModel(model);
-    if (selectedZones.size() > 0){
-        java.util.List <Integer> indicesList =3D new ArrayList<Integer>();
-        for (GenericCell c : selectedZones){
-            indicesList.add(model.indexOf(c));
-        }
-        int[] indices =3D new int[indicesList.size()];
-        int cnt =3D 0;
-        for (Integer i : indicesList){
-            indices[cnt]=3Di;
-            cnt ++;
-        }
-        componant.setSelectedIndices(indices);
-    }
-}
-protected void presenceChanged(){
-    getBean().setPopulationZone(getSelectedValue(populationZonesPresence));
-    setFieldPopulationMappingZoneReproZoneRecru();
-}
-protected void reproductionChanged(){
-    getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesRepro=
duction));
-    setFieldPopulationMappingZoneReproZoneRecru();
-}
-protected void recruitementChanged(){
-    getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecrui=
tment));
-    setFieldPopulationMappingZoneReproZoneRecru();
-}
-protected java.util.List<Zone> getSelectedValue(JAXXList componant){
-    Object[] selected =3D componant.getSelectedValues();
-    java.util.List<Zone> selectedZone =3D new ArrayList<Zone>();
-    if (selected !=3D null){
-        for (Object i : selected){
-            GenericCell cell =3D (GenericCell)i;
-            if (cell.getValue() !=3D null){
-                selectedZone.add((Zone)cell.getValue());
-            }
-        }
-    }
-    return selectedZone;
-}
     ]]>
     </script>
     <Table id=3D'body'>
         <row>
-            <cell fill=3D'horizontal' weightx=3D'0.3'>
-                <JLabel text=3D"isisfish.populationZones.selectPopulationAre=
as" enabled=3D'{isActif()}'/>
+            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1'>
+                <PopulationZonesEditorUI id=3D'popZones' constructorParams=
=3D'this' bean=3D'{getBean()}' actif=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{PopulationImpl.class}' _method=3D'"MappingZoneReproZoneRecru"'/>
             </cell>
-            <cell fill=3D'horizontal' weightx=3D'0.3'>
-                <JLabel text=3D"isisfish.populationZones.selectSpawningAreas=
" enabled=3D'{isActif()}'/>
-            </cell>
-            <cell fill=3D'horizontal' weightx=3D'0.3'>
-                <JLabel text=3D"isisfish.populationZones.selectRecruitmentAr=
eas" enabled=3D'{isActif()}'/>
-            </cell>
         </row>
         <row>
-            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
-                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
-                    <JList id=3D"populationZonesPresence" onMouseClicked=3D'=
presenceChanged()' enabled=3D'{isActif()}'/>
-                </JScrollPane>
-            </cell>
-            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
-                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
-                    <JList id=3D"fieldPopulationZonesReproduction" onMouseCl=
icked=3D'reproductionChanged()' enabled=3D'{isActif()}'/>
-                </JScrollPane>
-            </cell>
-            <cell fill=3D'both' weightx=3D'0.3' weighty=3D'0.5'>
-                <JScrollPane minimumSize=3D'{new Dimension(0,0)}' preferredS=
ize=3D'{new Dimension(0,0)}'>
-                    <JList id=3D"fieldPopulationZonesRecruitment" onMouseCli=
cked=3D'recruitementChanged()' enabled=3D'{isActif()}'/>
-                </JScrollPane>
-            </cell>
-        </row>
-        <row>
-            <cell columns=3D'3' anchor=3D'west'>
-                <JLabel text=3D"isisfish.populationZones.betweenSpawningRecr=
uitmentAreas" enabled=3D'{isActif()}'/>
-            </cell>
-        </row>
-        <row>
-            <cell columns=3D'3'  fill=3D'both' weightx=3D'1.0' weighty=3D'0.=
5'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id =3D'fiel=
dPopulationMappingZoneReproZoneRecru' enabled=3D'{isActif()}'/>
-            </cell>
-        </row>
-        <row>
-            <cell columns=3D'3' fill=3D'horizontal' weightx=3D'1.0'>
+            <cell fill=3D'horizontal' weightx=3D'1.0'>
                 <Table>
                     <row>
                         <cell fill=3D'horizontal' weightx=3D'0.5'>

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-03-17 13:33:34 UTC (rev 1981)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-17 14:14:48 UTC (rev 1982)
@@ -27,6 +27,7 @@
 import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI;
+import fr.ifremer.isisfish.ui.input.PopulationZonesEditorUI;
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
@@ -119,6 +120,13 @@
                 result =3D ipResult;
             } else if (result instanceof RangeOfValuesUI){
                 result =3D new JTextField("");
+            } else if (result instanceof PopulationZonesEditorUI){
+                PopulationZonesEditorUI origine =3D (PopulationZonesEditorUI=
)c;
+                PopulationZonesEditorUI ui =3D new PopulationZonesEditorUI(n=
ew JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
+                ui.setBean(origine.getBean());
+                ui.setActif(true);
+                ui.refresh();
+                result =3D ui;
             } else if (result instanceof PopulationMigrationMigrationUI){
                 PopulationMigrationMigrationUI origine =3D (PopulationMigrat=
ionMigrationUI)c;
                 PopulationMigrationMigrationUI ui =3D new PopulationMigratio=
nMigrationUI(new JAXXInitialContext().add(new InputAction()));
@@ -277,7 +285,15 @@
                 ipResult.setLabelRenderer(Month.MONTH);
                 ipResult.setModel(ip.getModel().clone());
                 result =3D ipResult;
-            }else if (result instanceof PopulationMigrationMigrationUI){
+            } else if (result instanceof PopulationZonesEditorUI){
+                PopulationZonesEditorUI origine =3D (PopulationZonesEditorUI=
)c;
+                PopulationZonesEditorUI ui =3D new PopulationZonesEditorUI(n=
ew JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
+                ui.setBean(origine.getBean());
+                ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix((=
MatrixND)value);
+                ui.setActif(true);
+                ui.refresh();
+                result =3D ui;
+            }  else if (result instanceof PopulationMigrationMigrationUI){
                 PopulationMigrationMigrationUI origine =3D (PopulationMigrat=
ionMigrationUI)c;
                 PopulationMigrationMigrationUI ui =3D new PopulationMigratio=
nMigrationUI(new JAXXInitialContext().add(new InputAction()));
                 ui.setBean(origine.getBean());
@@ -314,7 +330,9 @@
     Object result =3D null;
     if (c instanceof JTextComponent) {
          result =3D ((JTextComponent)c).getText();
-    } else if (c instanceof JTable){
+    } else if (c instanceof PopulationZonesEditorUI){
+         result =3D ((PopulationZonesEditorUI)c).getFieldPopulationMappingZo=
neReproZoneRecru().getMatrix();
+    }  else if (c instanceof JTable){
 //                ((JTable) result).setText(BeanUtils.getProperty(e, fieldNa=
me));
=20
     } else if (c instanceof MatrixPanelEditor){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Fa=
ctorWizard.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/FactorWi=
zard.jaxx	2009-03-17 13:33:34 UTC (rev 1981)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWi=
zard.jaxx	2009-03-17 14:14:48 UTC (rev 1982)
@@ -102,7 +102,7 @@
         }
         init();
     }
-    if (!isContinueSelected()){
+    if (!isContinueSelected() && EditorHelper.isRangeOfValue(cOrigine)){
         int i =3D 0;
         for (String s : EditorHelper.getDiscretRangeOfValueValues(cOrigine, =
bean)){
             JTextField text =3D new JTextField(s);


--===============4622650445607752747==--