From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:56 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1915 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/input	java/fr/ifremer/isisfish/ui/sensitivity
 resources
Date: Fri, 06 Mar 2009 00:48:47 +0100
Message-ID: <20090305234847.26B03461A7B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1957978560452659010=="

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

Author: sletellier
Date: 2009-03-05 23:48:46 +0000 (Thu, 05 Mar 2009)
New Revision: 1915

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.=
jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquatio=
nUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasic=
sUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquat=
ionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEquationUI.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/PopulationZones=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.j=
axx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTab=
sUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.j=
axx
   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
   isis-fish/trunk/src/main/resources/sensitivity.properties
Log:
Equations can be factored

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputCon=
tentUI.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/InputContentUI=
.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -44,7 +44,10 @@
     return getContextValue(FisheryRegion.class);
 }
 public void setInfoText(String msg){
-    getParentContainer(WelcomePanelUI.class).setInfoText(msg);
+    WelcomePanelUI root =3D getParentContainer(WelcomePanelUI.class);
+    if (root !=3D null){
+        getParentContainer(WelcomePanelUI.class).setInfoText(msg);
+    }
 }
 protected void goTo(){
     getParentContainer(InputUI.class).setTreeSelection(getNextPath());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOne=
EquationUI.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/InputOneEquati=
onUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquati=
onUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -35,10 +35,13 @@
=20
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
-
     <String id=3D'lblText' javaBean=3D'null'/>
-
     <org.codelutin.topia.persistence.TopiaEntity id=3D'bean' javaBean=3D'nul=
l'/>
+    <Class id=3D'clazz' javaBean=3D'null'/>
+    <String id=3D'methodGet' javaBean=3D'null'/>
+    <String id=3D'methodSet' javaBean=3D'null'/>
+    <String id=3D'nameEquation' javaBean=3D'null'/>
+    <fr.ifremer.isisfish.entities.Equation id=3D'selectedEquation' javaBean=
=3D'null'/>
=20
     <script><![CDATA[
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
@@ -55,15 +58,8 @@
 import fr.ifremer.isisfish.IsisFishDAOHelper;
 import jaxx.runtime.swing.Item;
=20
-protected Class clazz;
-//protected TopiaEntity bean;
-protected String methodGet;
-protected String methodSet;
-protected String name;
-protected Equation selectedEquation;
 protected DocumentListener listener =3D null;
=20
-
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
@@ -106,21 +102,6 @@
     setComboModel();
     editor.getCurrentEditor().addDocumentListener(listener);
 }
-public void init(String lblText, TopiaEntity bean, String name, String metho=
dGet, String methodSet, Class c){
-    editor.getCurrentEditor().removeDocumentListener(listener);
-     setLblText(lblText);
-//     this.bean =3D bean;
-    setBean(bean);
-     this.methodGet =3D methodGet;
-     this.methodSet =3D methodSet;
-     this.name =3D name;
-     this.clazz =3D c;
-     selectedEquation =3D getEquation();
-     setComboModel();
-     setFormule((Formule)combo.getSelectedItem());
-     setEditorText();
-     editor.getCurrentEditor().addDocumentListener(listener);
-}
 protected Equation getEquation(){
     Equation result =3D null;
     try {
@@ -150,34 +131,34 @@
     } catch (IOException ex) {
         Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVER=
E, null, ex);
     }
-    if (name !=3D null){
+    if (nameEquation !=3D null){
         setComboModel();
         setFormule((Formule)combo.getSelectedItem());
         setEditorText();
+        selectedEquation =3D getEquation();
     }
     editor.getCurrentEditor().addDocumentListener(listener);
  }
 protected void setComboModel(){
-    TopiaContext isisContext =3D getVerifier().getIsisContext();
-    if (isisContext =3D=3D null && getBean() !=3D  null){
-        isisContext =3D getBean().getTopiaContext();
-    }
-    java.util.List<Formule> formules =3D null;
-    if (name !=3D null){
-        formules =3D getAction().getFormules(isisContext, name);
-    }
-    if (formules !=3D null){
-        java.util.List<Item> items =3D new ArrayList<Item>();
-        items.add(new Item("null", " ", null, false));
-        for (Formule f : formules) {
-            boolean selected =3D f.equals(selectedEquation);
-            items.add(new Item(f.getName(), f.getName(), f, selected));
+    if (getBean() !=3D  null){
+        TopiaContext isisContext =3D getBean().getTopiaContext();
+        java.util.List<Formule> formules =3D null;
+        if (nameEquation !=3D null){
+            formules =3D getAction().getFormules(isisContext, nameEquation);
         }
-        combo.setItems(items);
+        if (formules !=3D null){
+            java.util.List<Item> items =3D new ArrayList<Item>();
+            items.add(new Item("null", " ", null, false));
+            for (Formule f : formules) {
+                boolean selected =3D f.equals(selectedEquation);
+                items.add(new Item(f.getName(), f.getName(), f, selected));
+            }
+            combo.setItems(items);
+        }
     }
 }
 protected void saveModel(){
-    getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getT=
ext());
+    getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", edi=
tor.getText());
     setComboModel();
     setInfoText(_("isisfish.message.saveModel.finished"));
 }
@@ -187,7 +168,7 @@
          getContextValue(InputAction.class).openEditor(e.getCategory(), e.ge=
tName(),  clazz, e.getContent(), editor);
     }
     else{
-        getContextValue(InputAction.class).openEditor(name, "new", clazz, ed=
itor.getText(), editor);
+        getContextValue(InputAction.class).openEditor(nameEquation, "new", c=
lazz, editor.getText(), editor);
     }
 }
 protected void setEditorText(){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSe=
asonInfoSpeciesUI.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/MetierSeasonIn=
foSpeciesUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -63,7 +63,6 @@
         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");fieldPopulationBasicsName.setText("=
");
-            targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFact=
or"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSp=
eciesTargetFactorEquation.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -112,8 +111,6 @@
             setTargetSpeciesModel();
         }
         setTableTargetSpeciesModel();
-// TODO : Equation selectionne
-        targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor")=
, null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpecie=
sTargetFactorEquation.class);
      }
      else{
         DefaultComboBoxModel seasonModel =3D new DefaultComboBoxModel();
@@ -242,7 +239,11 @@
                     </row>
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <InputOneEquationUI id=3D'targetFactor' construc=
torParams=3D'this'/>
+                            <InputOneEquationUI id=3D'targetFactor' construc=
torParams=3D'this'
+                                lblText=3D'{_("isisfish.metierSeasonInfoSpec=
ies.targetFactor")}'
+                                bean=3D'{null}'  nameEquation=3D'TargetFacto=
r'
+                                clazz=3D'{fr.ifremer.isisfish.equation.Targe=
tSpeciesTargetFactorEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{MetierImpl.cla=
ss}' _method=3D'""'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onBasicsUI.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/PopulationBasi=
csUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasi=
csUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -60,8 +60,6 @@
             fieldPopulationBasicsComment.setText("");
             fieldPopulationBasicsMatureClass.setSelectedItem(null);
             tableAgeLength.setModel(new DefaultTableModel());
-            growthEquation.init(_("isisfish.populationBasics.growth"), null,=
 "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.Populatio=
nGrowth.class);
-            growthReverseEquation.init(_("isisfish.populationBasics.growthRe=
verse"), null, "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.=
ifremer.isisfish.equation.PopulationGrowthReverse.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -76,12 +74,9 @@
     getVerifier().setNewButton(create, "Population", false);
     getVerifier().setDeleteButton(remove);
     Population population =3D getVerifier().getEntity(Population.class);
-    getVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
     setBean((PopulationImpl) population);
     if (getBean() !=3D null){
 // TODO : Selection equation
-        growthEquation.init(_("isisfish.populationBasics.growth"), getBean()=
, "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.Populati=
onGrowth.class);
-        growthReverseEquation.init(_("isisfish.populationBasics.growthRevers=
e"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr=
.ifremer.isisfish.equation.PopulationGrowthReverse.class);
         if (getBean() !=3D null){
             if (getBean().getPopulationGroup() !=3D null){
                 jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMat=
ureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
@@ -89,6 +84,7 @@
             setTableAgeLengthModel();
        }
     }
+    getVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
 }
 protected void createClasses(){
     JFrame wizardFrame =3D new JFrame();
@@ -193,12 +189,20 @@
                                 </row>
                                 <row>
                                     <cell columns=3D'3' fill=3D'both' weight=
x=3D'1.0' weighty=3D'1.0'>
-                                        <InputOneEquationUI id=3D'growthEqua=
tion' constructorParams=3D'this'/>
+                                        <InputOneEquationUI id=3D'growthEqua=
tion' constructorParams=3D'this'
+                                        lblText=3D'{_("isisfish.populationBa=
sics.growth")}'
+                                        bean=3D'{getBean()}'  nameEquation=
=3D'Growth' methodGet=3D'Growth' methodSet=3D'EquationGrowth'
+                                        clazz=3D'{fr.ifremer.isisfish.equati=
on.PopulationGrowth.class}'
+                                        decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"Growth"'/>
                                     </cell>
                                 </row>
                                 <row>
                                     <cell columns=3D'3' fill=3D'both' weight=
x=3D'1.0' weighty=3D'1.0'>
-                                        <InputOneEquationUI id=3D'growthReve=
rseEquation' constructorParams=3D'this'/>
+                                        <InputOneEquationUI id=3D'growthReve=
rseEquation' constructorParams=3D'this'
+                                        lblText=3D'{_("isisfish.populationBa=
sics.growthReverse")}'
+                                        bean=3D'{getBean()}'  nameEquation=
=3D'GrowthReverse' methodGet=3D'GrowthReverse' methodSet=3D'EquationGrowthRev=
erse'
+                                        clazz=3D'{fr.ifremer.isisfish.equati=
on.PopulationGrowthReverse.class}'
+                                        decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"GrowthReverse"'/>
                                     </cell>
                                 </row>
                                 <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onEquationUI.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/PopulationEqua=
tionUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEqua=
tionUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -48,9 +48,6 @@
         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");fieldPopulationBasicsName.setText("=
");
-            naturalDeathRate.init(_("isisfish.populationEquation.naturalDeat=
hRate"), null, "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathR=
ate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class);
-            meanWeight.init(_("isisfish.populationEquation.meanWeight"), nul=
l, "MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equa=
tion.PopulationMeanWeight.class);
-            price.init(_("isisfish.populationEquation.price"), null, "Price"=
, "Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.clas=
s);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -63,9 +60,6 @@
     getVerifier().setCancelButton(cancel);
     Population population =3D getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"),=
 getBean(), "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathRate=
", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class);
-    meanWeight.init(_("isisfish.populationEquation.meanWeight"), getBean(), =
"MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equatio=
n.PopulationMeanWeight.class);
-    price.init(_("isisfish.populationEquation.price"), getBean(), "Price", "=
Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class);
     getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price);
 }
     ]]>
@@ -73,17 +67,29 @@
     <Table id=3D'body'>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'0.5'  weighty=3D'0.=
3'>
-                <InputOneEquationUI id=3D'naturalDeathRate' constructorParam=
s=3D'this'/>
+                <InputOneEquationUI id=3D'naturalDeathRate' constructorParam=
s=3D'this'
+                    lblText=3D'{_("isisfish.populationEquation.naturalDeathR=
ate")}'
+                    bean=3D'{getBean()}'  nameEquation=3D'NaturalDeathRate' =
methodGet=3D'NaturalDeathRate' methodSet=3D'EquationNaturalDeathRate'
+                    clazz=3D'{fr.ifremer.isisfish.equation.PopulationNatural=
DeathRate.class}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"NaturalDeathRate"'/>
             </cell>
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'0.=
3'>
-                <InputOneEquationUI id=3D'meanWeight' constructorParams=3D't=
his'/>
+                <InputOneEquationUI id=3D'meanWeight' constructorParams=3D't=
his'
+                    lblText=3D'{_("isisfish.populationEquation.meanWeight")}'
+                    bean=3D'{getBean()}'  nameEquation=3D'MeanWeight' method=
Get=3D'MeanWeight' methodSet=3D'EquationMeanWeight'
+                    clazz=3D'{fr.ifremer.isisfish.equation.PopulationMeanWei=
ght.class}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"MeanWeight"'/>
             </cell>
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'0.=
3'>
-                <InputOneEquationUI id=3D'price' constructorParams=3D'this'/>
+                <InputOneEquationUI id=3D'price' constructorParams=3D'this'
+                    lblText=3D'{_("isisfish.populationEquation.price")}'
+                    bean=3D'{getBean()}'  nameEquation=3D'Price' methodGet=
=3D'Price' methodSet=3D'EquationPrice'
+                    clazz=3D'{fr.ifremer.isisfish.equation.PopulationPrice.c=
lass}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"Price"'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEquationUI.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=
ationEquationUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEquationUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -51,9 +51,6 @@
         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");fieldPopulationBasicsName.setText("=
");
-            migrationEquation.init(_("isisfish.common.migration"), null, "Mi=
gration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfi=
sh.equation.MigrationEquation.class);
-            emigrationEquation.init(_("isisfish.common.emigration"), null, "=
Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.i=
sisfish.equation.EmigrationEquation.class);
-            immigrationEquation.init(_("isisfish.common.immigration"), null,=
 "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifre=
mer.isisfish.equation.ImmigrationEquation.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -67,9 +64,6 @@
 public void refresh(){
     Population population =3D getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "Mi=
gration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfi=
sh.equation.MigrationEquation.class);
-    emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "=
Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.i=
sisfish.equation.EmigrationEquation.class);
-    immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(),=
 "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifre=
mer.isisfish.equation.ImmigrationEquation.class);
     getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, m=
igrationEquation);
 }
     ]]>
@@ -77,17 +71,29 @@
     <Table id=3D'body'>
         <row>
             <cell fill=3D'both' weightx=3D'1.0'  weighty=3D'0.3'>
-                <InputOneEquationUI id=3D'migrationEquation' constructorPara=
ms=3D'this'/>
+                <InputOneEquationUI id=3D'migrationEquation' constructorPara=
ms=3D'this'
+                    lblText=3D'{_("isisfish.common.migration")}'
+                    bean=3D'{getPopInfo()}'  name=3D'Migration' methodGet=3D=
'MigrationEquation' methodSet=3D'MigrationEquationAsString'
+                    clazz=3D'{fr.ifremer.isisfish.equation.MigrationEquation=
.class}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"Growth"'/>
             </cell>
         </row>
         <row>
             <cell fill=3D'both' weightx=3D'1.0'  weighty=3D'0.3'>
-                <InputOneEquationUI id=3D'emigrationEquation' constructorPar=
ams=3D'this'/>
+                <InputOneEquationUI id=3D'emigrationEquation' constructorPar=
ams=3D'this'
+                    lblText=3D'{_("isisfish.common.emigration")}'
+                    bean=3D'{getPopInfo()}'  nameEquation=3D'Emigration' met=
hodGet=3D'EmigrationEquation' methodSet=3D'EmigrationEquationAsString'
+                    clazz=3D'{fr.ifremer.isisfish.equation.EmigrationEquatio=
n.class}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"Growth"'/>
             </cell>
         </row>
         <row>
             <cell fill=3D'both' weightx=3D'1.0'  weighty=3D'0.3'>
-                <InputOneEquationUI id=3D'immigrationEquation' constructorPa=
rams=3D'this'/>
+                <InputOneEquationUI id=3D'immigrationEquation' constructorPa=
rams=3D'this'
+                    lblText=3D'{_("isisfish.common.immigration")}'
+                    bean=3D'{getPopInfo()}'  name=3D'Immigration' methodGet=
=3D'ImmigrationEquation' methodSet=3D'ImmigrationEquationAsString'
+                    clazz=3D'{fr.ifremer.isisfish.equation.ImmigrationEquati=
on.class}'
+                    decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"Growth"'/>
             </cell>
         </row>
     </Table>

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-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecr=
uitmentUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -53,7 +53,6 @@
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");
             fieldPopulationMonthGapBetweenReproRecrutement.setText("");
             fieldPopulationRecruitmentComment.setText("");
-            reproductionEquation.init(_("isisfish.populationRecruitment.repr=
oductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "Equat=
ionReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class=
);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -79,7 +78,6 @@
     Population population =3D getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
=20
-    reproductionEquation.init(_("isisfish.populationRecruitment.reproduction=
Equation"), getBean(), "Reproduction", "ReproductionEquation", "EquationRepro=
ductionEquation", fr.ifremer.isisfish.equation.PopulationReproductionEquation=
.class);
     getVerifier().addCurrentPanel(reproductionEquation);
=20
     if(getBean() !=3D null && getBean().getRecruitmentDistribution() !=3D nu=
ll){
@@ -95,7 +93,11 @@
                 <Table>
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <InputOneEquationUI id=3D'reproductionEquation' =
constructorParams=3D'this'/>
+                            <InputOneEquationUI id=3D'reproductionEquation' =
constructorParams=3D'this'
+                                lblText=3D'{_("isisfish.populationRecruitmen=
t.reproductionEquation")}'
+                                bean=3D'{getBean()}'  nameEquation=3D'Reprod=
uction' methodGet=3D'ReproductionEquation' methodSet=3D'EquationReproductionE=
quation'
+                                clazz=3D'{fr.ifremer.isisfish.equation.Popul=
ationReproductionEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{PopulationImpl=
.class}' _method=3D'"ReproductionEquation"'/>
                         </cell>
                     </row>
                     <row>

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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -199,7 +199,7 @@
         </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()}'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id =3D'fiel=
dPopulationMappingZoneReproZoneRecru' enabled=3D'{isActif()}' decorator=3D'bo=
xed' _bean=3D'{PopulationImpl.class}' _method=3D'"MappingZoneReproZoneRecru"'=
/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityUI.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/SelectivityUI.=
jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -63,7 +63,6 @@
         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");
-            selectivityEquation.init(_("isisfish.selectivity.equation"), nul=
l, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquatio=
n.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -105,9 +104,6 @@
         fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
         setSelectivityTableModel();
     }
-
-// TODO : Equation selection
-    selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Sele=
ctivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class);
    =20
     getVerifier().addCurrentPanel(selectivityEquation);
=20
@@ -187,7 +183,11 @@
                     </row>
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <InputOneEquationUI id=3D'selectivityEquation' c=
onstructorParams=3D'this'/>
+                            <InputOneEquationUI id=3D'selectivityEquation' c=
onstructorParams=3D'this'
+                                lblText=3D'{_("isisfish.selectivity.equation=
")}'
+                                bean=3D'{null}'  nameEquation=3D'Selectivity'
+                                clazz=3D'{fr.ifremer.isisfish.equation.Selec=
tivityEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{GearImpl.class=
}' _method=3D'""'/>
                         </cell>
                     </row>
                 </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVes=
selsTabsUI.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/SetOfVesselsTa=
bsUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTa=
bsUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -54,7 +54,6 @@
         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");fieldPopulationBasicsName.setText("=
");
-            technicalEfficiency.init(_("isisfish.setOfVessels.technicalEffic=
iency"), null, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "Equatio=
nTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEqu=
ation.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -75,7 +74,6 @@
         jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion(=
).getPort(), getBean().getPort(), true);
         jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getR=
egion().getVesselType(), getBean().getVesselType(), true);
         init=3Dfalse;
-        technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficienc=
y"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "Equati=
onTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEq=
uation.class);
         getVerifier().addCurrentPanel(technicalEfficiency);
     }
 }
@@ -130,12 +128,18 @@
                             <JLabel text=3D"isisfish.setOfVessels.fixedCosts=
" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JTextField id=3D"fieldSetOfVesselsFixedCosts" t=
ext=3D'{getBean().getFixedCosts()}' onKeyReleased=3D'getBean().setFixedCosts(=
Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled=3D'{isAct=
if()}' decorator=3D'boxed' _bean=3D'{SetOfVesselsImpl.class}' _method=3D'"Fix=
edCosts"'/>
+                            <JTextField id=3D"fieldSetOfVesselsFixedCosts" t=
ext=3D'{getBean().getFixedCosts()}'
+                            onKeyReleased=3D'getBean().setFixedCosts(Double.=
parseDouble(fieldSetOfVesselsFixedCosts.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{SetOfVesselsImpl.class}' _method=3D'"FixedCosts"'/>
                         </cell>
                     </row>
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'0.3'>
-                            <InputOneEquationUI id=3D'technicalEfficiency' c=
onstructorParams=3D'this'/>
+                            <InputOneEquationUI id=3D'technicalEfficiency' c=
onstructorParams=3D'this'
+                                lblText=3D'{_("isisfish.setOfVessels.technic=
alEfficiency")}'
+                                bean=3D'{getBean()}'  nameEquation=3D'Techni=
calEfficiency' methodGet=3D'TechnicalEfficiencyEquation' methodSet=3D'Equatio=
nTechnicalEfficiency'
+                                clazz=3D'{fr.ifremer.isisfish.equation.SoVTe=
chnicalEfficiencyEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{SetOfVesselsIm=
pl.class}' _method=3D'"TechnicalEfficiencyEquation"'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
TabUI.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/StrategyTabUI.=
jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -56,7 +56,6 @@
             fieldStrategyName.setText("");
             fieldStrategyProportionSetOfVessels.setText("0.0");
             fieldStrategyComment.setText("");
-            strategyInactivity.init("isisfish.strategy.inactivity", null, "I=
nactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.e=
quation.StrategyInactivityEquation.class);
         }
         if (evt.getNewValue() !=3D null) {
             // add binding on getBean()
@@ -73,7 +72,6 @@
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
     if (getBean() !=3D null){
-        strategyInactivity.init("isisfish.strategy.inactivity", getBean(), "=
Inactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.=
equation.StrategyInactivityEquation.class);
         getVerifier().addCurrentPanel(strategyInactivity);
         setSetOfVesselsModel();
     }
@@ -114,7 +112,9 @@
                             <JLabel text=3D"isisfish.strategy.proportionSetO=
fVessels" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JTextField id=3D"fieldStrategyProportionSetOfVe=
ssels"  text=3D'{getBean().getProportionSetOfVessels()}' onKeyReleased=3D'get=
Bean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSe=
tOfVessels.getText()))' enabled=3D'{isActif()}' decorator=3D'boxed' _bean=3D'=
{StrategyImpl.class}' _method=3D'"ProportionSetOfVessels"'/>
+                            <JTextField id=3D"fieldStrategyProportionSetOfVe=
ssels"  text=3D'{getBean().getProportionSetOfVessels()}'
+                            onKeyReleased=3D'getBean().setProportionSetOfVes=
sels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{StrategyImpl.class}' _method=3D'"ProportionSetOfVessels"'/>
                         </cell>
                     </row>
                     <row>
@@ -127,7 +127,11 @@
                     </row>
                     <row>
                         <cell columns=3D"2" fill=3D'both' weightx=3D'1.0'>
-                            <InputOneEquationUI id=3D"strategyInactivity" co=
nstructorParams=3D'this'/>
+                            <InputOneEquationUI id=3D"strategyInactivity" co=
nstructorParams=3D'this'
+                                lblText=3D'{_("isisfish.strategy.inactivity"=
)}'
+                                bean=3D'{getBean()}'  nameEquation=3D'Inacti=
vity' methodGet=3D'InactivityEquation' methodSet=3D'EquationInactivity'
+                                clazz=3D'{fr.ifremer.isisfish.equation.Strat=
egyInactivityEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{StrategyImpl.c=
lass}' _method=3D'"Inactivity"'/>
                         </cell>
                     </row>
                     <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-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-05 23:48:46 UTC (rev 1915)
@@ -5,6 +5,7 @@
=20
 package fr.ifremer.isisfish.ui.sensitivity;
=20
+import fr.ifremer.isisfish.ui.input.InputAction;
 import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import java.lang.reflect.Method;
@@ -18,6 +19,7 @@
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
+import jaxx.runtime.JAXXInitialContext;
 import org.apache.commons.beanutils.BeanUtils;
 import org.codelutin.math.matrix.MatrixND;
 import org.codelutin.math.matrix.gui.MatrixPanelEditor;
@@ -55,8 +57,17 @@
                 ((JRadioButton) result).setSelected((Boolean)callMethod(e, f=
ieldName));
=20
             } else if (result instanceof InputOneEquationUI){
-//                ((InputOneEquationUI) result).init(setText(BeanUtils.getPr=
operty(e, fieldName)));
-
+                InputOneEquationUI origine =3D (InputOneEquationUI) c;
+                InputOneEquationUI ui =3D new InputOneEquationUI(new JAXXIni=
tialContext().add(new InputAction()));
+                ui.setLblText(origine.getLblText());
+                ui.setNameEquation(origine.getNameEquation());
+                ui.setClazz(origine.getClazz());
+                ui.setMethodGet(origine.getMethodGet());
+                ui.setMethodSet(origine.getMethodSet());
+                ui.setBean(e);
+                ui.setActif(true);
+                ui.refresh();
+                result =3D ui;
             } else if (result instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e=
, fieldName)));
=20

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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWi=
zard.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -30,7 +30,7 @@
  * by : $Author: sletellier $
  */
  -->
-<JDialog id=3D"FactorTypeChooser" title=3D'isisfish.factor.title' resizable=
=3D'false' modal=3D'true' layout=3D'{new BorderLayout()}'>
+<JDialog id=3D"FactorTypeChooser" title=3D'isisfish.factor.title' resizable=
=3D'false' layout=3D'{new BorderLayout()}'>
=20
     <Boolean id=3D'continuePossible' javaBean=3D'true'/>
=20

Modified: isis-fish/trunk/src/main/resources/sensitivity.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/resources/sensitivity.properties	2009-03-05 16:5=
3:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/resources/sensitivity.properties	2009-03-05 23:4=
8:46 UTC (rev 1915)
@@ -28,6 +28,9 @@
 Population.Comment
 Population.Capturability
 Population.CapturabilityComment
+Population.MappingZoneReproZoneRecru
+Population.Growth
+Population.GrowthReverse
 PopulationGroup.MeanWeight
 PopulationGroup.Price
 Population.NaturalDeathRateMatrix


--===============1957978560452659010==--