From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:57 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1949 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/input	java/fr/ifremer/isisfish/ui/sensitivity
	java/fr/ifremer/isisfish/ui/simulator resources/i18n resources/icons
Date: Thu, 12 Mar 2009 12:44:12 +0100
Message-ID: <20090312114412.44365461A7B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8307883857639575622=="

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

Author: sletellier
Date: 2009-03-12 11:44:11 +0000 (Thu, 12 Mar 2009)
New Revision: 1949

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI=
.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.=
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/StrategyOneMont=
hInfoUI.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/input/ZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWiz=
ard.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.ja=
xx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
   isis-fish/trunk/src/main/resources/icons/building.png
   isis-fish/trunk/src/main/resources/icons/building_add.png
Log:
Adding color glassPane, factor rangeOfValue, debug....

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabU=
I.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/GearTabUI.jaxx=
	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx=
	2009-03-12 11:44:11 UTC (rev 1949)
@@ -37,6 +37,7 @@
=20
=20
      <script><![CDATA[
+import fr.ifremer.isisfish.types.RangeOfValues;
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.GearImpl;
 import fr.ifremer.isisfish.ui.WelcomePanelUI;
@@ -44,8 +45,7 @@
 import org.codelutin.topia.TopiaException;
 import jaxx.runtime.swing.navigation.NavigationTreeModel;
 import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode;
-import fr.ifremer.isisfish.types.RangeOfValues;
-boolean init =3D false;
+
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
@@ -55,7 +55,6 @@
             fieldGearEffortUnit.setText("");
             fieldGearStandardisationFactor.setText("");
             fieldGearParamName.setText("");
-            fieldGearParamPossibleValue.setText("");
             fieldGearComment.setText("");
         }
         if (evt.getNewValue() !=3D null) {
@@ -71,23 +70,8 @@
     getVerifier().setDeleteButton(remove);
     Gear gear =3D getVerifier().getEntity(Gear.class);
     setBean((GearImpl) gear);
-    java.util.List<Object> values =3D new ArrayList<Object>();
-    for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleT=
ypes())
-        values.add(value);
-    if (getBean() !=3D null){
-        if (values !=3D null){
-            init =3D true;
-            jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, =
getBean().getPossibleValue() =3D=3D null ? null : getBean().getPossibleValue(=
).getType(), true);
-            init =3D false;
-        }
-    }
+    getVerifier().addCurrentPanel(rangeOfValues);
 }
-protected void paramChanged(){
-    if (fieldGearParamType.getSelectedItem() !=3D null){
-        if (!init)
-            getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.=
getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText=
() + "]")));
-    }
-}
     ]]>
     </script>
     <Table id=3D'body'>
@@ -130,12 +114,9 @@
                         <cell fill=3D'horizontal' anchor=3D'east'>
                             <JLabel text=3D"isisfish.gear.rangeValues" enabl=
ed=3D'{isActif()}'/>
                         </cell>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JComboBox id=3D"fieldGearParamType" onActionPer=
formed=3D'paramChanged()' enabled=3D'{isActif()}'/>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <RangeOfValuesUI id=3D"rangeOfValues" actif=3D'{=
isActif()}' constructorParams=3D'{this}'/>
                         </cell>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JTextField id=3D"fieldGearParamPossibleValue" t=
ext=3D'{getBean().getPossibleValue() =3D=3D null ? "" : getBean().getPossible=
Value().getValues()}' onKeyReleased=3D'paramChanged()' enabled=3D'{isActif()}=
' decorator=3D'boxed' _bean=3D'{GearImpl.class}' _method=3D'"PossibleValue"'/>
-                        </cell>
                     </row>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>

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-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -14,6 +14,8 @@
     <jaxx.runtime.swing.BlockingLayerUI id=3D'layerUI'
                      blockIcon=3D'{SwingUtil.createImageIcon("building.png")=
}'
                      acceptIcon=3D'{SwingUtil.createImageIcon("building_add.=
png")}'
+                     useIcon=3D'true'
+                     blockingColor=3D'{new Color(50,50,50)}'
                      acceptAction=3D'{new AbstractAction() { private static =
final long serialVersionUID =3D 1L;
                      @Override
                      public void actionPerformed(ActionEvent e) {
@@ -62,16 +64,20 @@
             // Verifie si dans l'entr=C3=A9 existe dans le fichier sensitivi=
ty.properties
             Class classBean =3D (Class)boxed.getClientProperty("bean");
             String method =3D (String)boxed.getClientProperty("method");
-            boolean isSensitivity =3D UtilsUI.isSensitivity(classBean.getSim=
pleName().replace("Impl", "") + "." + method);
-
+            boolean isSensitivity =3D false;
+            if (classBean !=3D null){
+                   isSensitivity =3D UtilsUI.isSensitivity(classBean.getSimp=
leName().replace("Impl", "") + "." + method);
+            }
             jaxx.runtime.swing.BlockingLayerUI ui =3D active ? layerUI.clone=
() : null;
+            if (classBean =3D=3D null && ui !=3D null){
+                ui.setBlock(true);
+            }
             ui.setUseIcon(isSensitivity && isActif());
             SwingUtil.getLayer(boxed).setUI(ui);
         }
     }
 }
=20
-
 protected void accept(ActionEvent e) {
     JComponent source =3D (JComponent) e.getSource();
     FactorWizard wizard =3D new FactorWizard(this);

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-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -36,6 +36,8 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.MetierImpl id=3D'bean' javaBean=3D'null'/>
=20
+    <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id=3D'metierInfo' jav=
aBean=3D'null'/>
+
     <Boolean id=3D'metierSeasonSelected' javaBean=3D'false'/>
    =20
     <Boolean id=3D'targetSpeciesSelected' javaBean=3D'false'/>
@@ -49,6 +51,7 @@
 import fr.ifremer.isisfish.entities.Metier;
 import fr.ifremer.isisfish.entities.MetierImpl;
 import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.TargetSpecies;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
 import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;=20
@@ -192,15 +195,13 @@
     }
 }
 protected void remove(){
-    Object season =3D ((GenericCell)fieldMetierSeasonInfo.getSelectedItem())=
.getValue();
-    if (season !=3D null){
-        MetierSeasonInfo m =3D (MetierSeasonInfo) season;
-        Object[] targetSpecies =3D m.getSpeciesTargetSpecies().toArray();
+    if (isMetierSeasonSelected()){
+        Object[] targetSpecies =3D getMetierInfo().getSpeciesTargetSpecies()=
.toArray();
=20
-        Object o =3D targetSpecies[tableTargetSpecies.getSelectedRow() + 1];
+        Object o =3D targetSpecies[tableTargetSpecies.getSelectedRow()];
         if (o !=3D null){
             TargetSpecies ts =3D (TargetSpecies)o;
-            getAction().removeTargetSpecies(m, ts);
+            getAction().removeTargetSpecies(getMetierInfo(), ts);
             setTableTargetSpeciesModel();
         }
     }
@@ -208,7 +209,8 @@
 protected void metierSeasonChanged(){
     setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() !=3D nul=
l);
     if (isMetierSeasonSelected()){
-        getVerifier().addCurrentEntity((TopiaEntity)((GenericCell)fieldMetie=
rSeasonInfo.getSelectedItem()).getValue());
+        setMetierInfo((MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonI=
nfo.getSelectedItem()).getValue());
+        getVerifier().addCurrentEntity(getMetierInfo());
     }
     setTargetSpeciesModel();
     setTableTargetSpeciesModel();

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValu=
esUI.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/RangeOfValuesU=
I.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesU=
I.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -0,0 +1,57 @@
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.GearImpl id=3D'bean' javaBean=3D'null'/>
+
+     <script><![CDATA[
+import fr.ifremer.isisfish.types.RangeOfValues;
+import fr.ifremer.isisfish.entities.Gear;
+import fr.ifremer.isisfish.entities.GearImpl;
+
+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");fieldPopulationBasicsName.setText("=
");
+            fieldGearParamPossibleValue.setText("");
+        }
+        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");
+        }
+    }
+});
+
+boolean init =3D false;
+public void refresh(){
+    Gear gear =3D getVerifier().getEntity(Gear.class);
+    setBean((GearImpl) gear);
+    java.util.List<Object> values =3D new ArrayList<Object>();
+    for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleT=
ypes())
+        values.add(value);
+    if (getBean() !=3D null){
+        if (values !=3D null){
+            init =3D true;
+            jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, =
getBean().getPossibleValue() =3D=3D null ? null : getBean().getPossibleValue(=
).getType(), true);
+            init =3D false;
+        }
+    }
+}
+protected void paramChanged(){
+    if (fieldGearParamType.getSelectedItem() !=3D null){
+        if (!init)
+            getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.=
getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText=
() + "]")));
+    }
+}
+     ]]></script>
+    <Table id=3D'body'>
+        <row>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JComboBox id=3D"fieldGearParamType" onActionPerformed=3D'pa=
ramChanged()' enabled=3D'{isActif()}'/>
+            </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JTextField id=3D"fieldGearParamPossibleValue" text=3D'{getB=
ean().getPossibleValue() =3D=3D null ? "" : getBean().getPossibleValue().getV=
alues()}' onKeyReleased=3D'paramChanged()' enabled=3D'{isActif()}' decorator=
=3D'boxed' _bean=3D'{GearImpl.class}' _method=3D'"PossibleValue"'/>
+            </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/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-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -149,7 +149,7 @@
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'1.=
0'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id=3D"field=
StrategyMonthInfoProportion" linearModelShowDefault=3D'{true}' linearModel=3D=
'{true}' matrix=3D'{getStrategyMonthInfo().getProportionMetier() =3D=3D null =
? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled=3D'{is=
Actif()}' decorator=3D'boxed' _bean=3D'{StrategyMonthInfoImpl.class}' _method=
=3D'"ProportionMetier"'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id=3D"field=
StrategyMonthInfoProportion" linearModelShowDefault=3D'{true}' linearModel=3D=
'{false}' matrix=3D'{getStrategyMonthInfo().getProportionMetier() =3D=3D null=
 ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled=3D'{i=
sActif()}' decorator=3D'boxed' _bean=3D'{StrategyMonthInfoImpl.class}' _metho=
d=3D'"ProportionMetier"'/>
             </cell>
         </row>
     </Table>

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-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -122,13 +122,13 @@
                             <JPanel/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JCheckBox id=3D"fieldUseEquationInactivity" sel=
ected=3D'{getBean().getInactivityEquationUsed()}' text=3D"isisfish.strategy.i=
nactivityEquationUsed" onActionPerformed=3D'getBean().setInactivityEquationUs=
ed(fieldUseEquationInactivity.isSelected())' enabled=3D'{isActif()}' decorato=
r=3D'boxed' _bean=3D'{StrategyImpl.class}' _method=3D'"InactivityEquationUsed=
"'/>
+                            <JCheckBox id=3D"fieldUseEquationInactivity" sel=
ected=3D'{getBean().getInactivityEquationUsed()}' text=3D"isisfish.strategy.i=
nactivityEquationUsed" onActionPerformed=3D'getBean().setInactivityEquationUs=
ed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(field=
UseEquationInactivity.isSelected())' enabled=3D'{isActif()}' decorator=3D'box=
ed' _bean=3D'{StrategyImpl.class}' _method=3D'"InactivityEquationUsed"'/>
                         </cell>
                     </row>
                     <row>
                         <cell columns=3D"2" fill=3D'both' weightx=3D'1.0'>
                             <InputOneEquationUI id=3D"strategyInactivity" co=
nstructorParams=3D'this'
-                                lblText=3D'{_("isisfish.strategy.inactivity"=
)}'
+                                lblText=3D'{_("isisfish.strategy.inactivity"=
)}' actif=3D'{fieldUseEquationInactivity.isSelected()}'
                                 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"'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.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/input/ZoneUI.jaxx	20=
09-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	20=
09-03-12 11:44:11 UTC (rev 1949)
@@ -163,6 +163,7 @@
                                     <JTextArea id=3D"fieldZoneComment"
                                     text=3D'{jaxx.runtime.SwingUtil.getStrin=
gValue(getBean().getComment())}'
                                     enabled=3D'{isActif()}'
+                                    decorator=3D'boxed'
                                     onKeyReleased=3D'getBean().setComment(fi=
eldZoneComment.getText())'/>
                                 </JScrollPane>
                             </cell>

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-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWi=
zard.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -30,7 +30,7 @@
  * by : $Author: sletellier $
  */
  -->
-<JDialog id=3D"FactorTypeChooser" title=3D'isisfish.factor.title' layout=3D'=
{new BorderLayout()}'>
+<JDialog id=3D"FactorTypeChooser" title=3D'isisfish.factor.title' modal=3D'{=
true}' layout=3D'{new BorderLayout()}'>
=20
     <Boolean id=3D'continuePossible' javaBean=3D'true'/>
=20
@@ -89,7 +89,7 @@
     // ex : fwn#fsd#0.3425345#name
     this.path =3D bean.getTopiaId() + "#" + EditorHelper.getMethod(cOrigine);
=20
-    factorName.setText(path);
+    factorName.setText(bean.toString() + "." + EditorHelper.getMethod(cOrigi=
ne));
     setContinuePossible(b);
     init();
 }
@@ -203,17 +203,13 @@
                 <JLabel text=3D'isisfish.factor.firstValue' visible=3D'{isCo=
ntinuePossible()}' enabled=3D'{isContinueSelected()}'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JScrollPane>
-                    <JPanel id=3D'continueMinPanel' layout=3D'{new BorderLay=
out()}'/>
-                </JScrollPane>
+                <JPanel id=3D'continueMinPanel' layout=3D'{new BorderLayout(=
)}'/>
             </cell>
             <cell fill=3D'horizontal'>
                 <JLabel text=3D'isisfish.factor.lastValue' visible=3D'{isCon=
tinuePossible()}' enabled=3D'{isContinueSelected()}'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JScrollPane>
-                    <JPanel id=3D'continueMaxPanel' layout=3D'{new BorderLay=
out()}'/>
-                </JScrollPane>
+                <JPanel id=3D'continueMaxPanel' layout=3D'{new BorderLayout(=
)}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityUI.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/Sensitiv=
ityUI.jaxx	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -50,7 +50,7 @@
     </script>
     <JTabbedPane id=3D"sensitivityTabs" constraints=3D"BorderLayout.CENTER">
         <tab title=3D'isisfish.params.title'>
-            <ParamsUI id=3D'paramsUI' constructorParams=3D'getContextValue(S=
imulAction.class)'/>
+            <ParamsUI id=3D'paramsUI' sensitivity=3D'{true}' constructorPara=
ms=3D'getContextValue(SimulAction.class)'/>
         </tab>
         <tab title=3D'isisfish.sensitivityChooser.title'>
             <SensitivityChooserUI id=3D"sensitivityChooserUI" constructorPar=
ams=3D'new JAXXInitialContext().add(this)'/>

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-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.j=
axx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -36,359 +36,355 @@
     <Boolean id=3D'sensitivity' javaBean=3D'false'/>
=20
     <script><![CDATA[
-    import static org.codelutin.i18n.I18n._;
-    import fr.ifremer.isisfish.ui.Common;
-    import fr.ifremer.isisfish.datastore.RuleStorage;
-    import fr.ifremer.isisfish.ui.WelcomeUI;
-    import fr.ifremer.isisfish.ui.WelcomePanelUI;
-    import fr.ifremer.isisfish.ui.WelcomeTabUI;
-    import fr.ifremer.isisfish.simulator.SimulationParameter;
-    import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
-    import fr.ifremer.isisfish.entities.Strategy;
-    import fr.ifremer.isisfish.entities.Population;
-    import fr.ifremer.isisfish.rule.Rule;
-    import org.codelutin.math.matrix.gui.MatrixPanelEditor;
-    import javax.swing.table.DefaultTableModel;
-    import java.text.ParseException;
-    import java.util.logging.Level;
-    import java.util.logging.Logger;
-    import java.awt.event.ItemEvent;
-    import javax.swing.table.TableModel;
-    import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-    import javax.swing.table.TableColumn;
-    import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
-    import static javax.swing.JOptionPane.showMessageDialog;
-    import javax.swing.text.JTextComponent;
-    import org.dom4j.DocumentHelper;
-    import org.dom4j.Element;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationService;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
-    import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
-    import fr.ifremer.isisfish.entities.FisheryRegionImpl;
-    import fr.ifremer.isisfish.datastore.StorageException;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
-    SimulationServiceListener simulationListener;
+import static org.codelutin.i18n.I18n._;
+import fr.ifremer.isisfish.ui.Common;
+import fr.ifremer.isisfish.datastore.RuleStorage;
+import fr.ifremer.isisfish.ui.WelcomeUI;
+import fr.ifremer.isisfish.ui.WelcomePanelUI;
+import fr.ifremer.isisfish.ui.WelcomeTabUI;
+import fr.ifremer.isisfish.simulator.SimulationParameter;
+import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
+import fr.ifremer.isisfish.entities.Strategy;
+import fr.ifremer.isisfish.entities.Population;
+import fr.ifremer.isisfish.rule.Rule;
+import org.codelutin.math.matrix.gui.MatrixPanelEditor;
+import javax.swing.table.DefaultTableModel;
+import java.text.ParseException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.awt.event.ItemEvent;
+import javax.swing.table.TableModel;
+import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+import javax.swing.table.TableColumn;
+import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
+import static javax.swing.JOptionPane.showMessageDialog;
+import javax.swing.text.JTextComponent;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import fr.ifremer.isisfish.simulator.launcher.SimulationService;
+import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
+import fr.ifremer.isisfish.entities.FisheryRegionImpl;
+import fr.ifremer.isisfish.datastore.StorageException;
+import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
+SimulationServiceListener simulationListener;
=20
-	simulationListener =3D new SimulationServiceListener() {
-        @Override
-        public void simulationStart(SimulationService simService, Simulation=
Job job) {
-        }
+simulationListener =3D new SimulationServiceListener() {
+    @Override
+    public void simulationStart(SimulationService simService, SimulationJob =
job) {
+    }
=20
-        @Override
-        public void simulationStop(SimulationService simService, SimulationJ=
ob job) {
-            fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true));
-        }
+    @Override
+    public void simulationStop(SimulationService simService, SimulationJob j=
ob) {
+        fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true));
+    }
=20
-        @Override
-        public void clearJobDone(SimulationService simService) {
-        }
+    @Override
+    public void clearJobDone(SimulationService simService) {
     }
-   =20
-    public ParamsUI(SimulAction action){
-        =20
-        setContextValue(action);
+}
+
+public ParamsUI(SimulAction action){
+
+    setContextValue(action);
+}
+public void refresh(){
+    SimulationService.getService().removeSimulationServiceListener(simulatio=
nListener);
+    SimulationService.getService().addSimulationServiceListener(simulationLi=
stener);
+    if (getContextValue(SimulAction.class).getSimulationStorage() !=3D null){
+        fieldSimulParamsName.setText(getContextValue(SimulAction.class).getS=
imulationStorage().getName());
     }
-    public void refresh(){
-        setSensitivity(getParentContainer(SensitivityUI.class) !=3D null);
-        SimulationService.getService().removeSimulationServiceListener(simul=
ationListener);
-        SimulationService.getService().addSimulationServiceListener(simulati=
onListener);
-        if (getContextValue(SimulAction.class).getSimulationStorage() !=3D n=
ull){
-            fieldSimulParamsName.setText(getContextValue(SimulAction.class).=
getSimulationStorage().getName());
-        }
-        fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getS=
imulationParameter().getDescription());
-        setListSimulParamsStrategiesItems();
-        setListSimulParamsPopulationsItems();
-        setRulesItems();
-        fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.c=
lass).getSimulationParameter().getRegionName());
-        if (getContextValue(SimulAction.class).getSimulationParameter().getU=
sePreScript()){
-            SimulUI simul =3D getParentContainer(SimulUI.class);
-            simul.enablePreSimul();
-        }
-        if (getContextValue(SimulAction.class).getSimulationParameter().getU=
seAnalysePlan()){
-            SimulUI simul =3D getParentContainer(SimulUI.class);
-            simul.enableAnalysePlan();
-        }
+    fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimul=
ationParameter().getDescription());
+    setListSimulParamsStrategiesItems();
+    setListSimulParamsPopulationsItems();
+    setRulesItems();
+    fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class=
).getSimulationParameter().getRegionName());
+    if (getContextValue(SimulAction.class).getSimulationParameter().getUsePr=
eScript()){
+        SimulUI simul =3D getParentContainer(SimulUI.class);
+        simul.enablePreSimul();
     }
-//    public void setSimulName(String name){
-//        fieldSimulParamsName.setText(name);
-//    }
-    protected void regionChange(ItemEvent e){
-        if (e.getStateChange() =3D=3D ItemEvent.SELECTED) {
-            // le premier item est " " pour ne pas avoir de selection par de=
faut
-            final String selected =3D fieldSimulParamsRegion.getSelectedItem=
().toString();
-            if (log.isDebugEnabled()) {
-                log.debug(" selected " + selected);
-            }
-            if(selected !=3D null && !selected.trim().isEmpty()) {        =09
-            	getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfis=
h.message.loading.region"));
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        getContextValue(SimulAction.class).regionChange(sele=
cted);
-                        refresh();
-                        if (isSensitivity()){
-                            try {
-                                getParentContainer(SensitivityUI.class).getS=
ensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.c=
lass).getSimulationParameter().getRegion().getFisheryRegion());
-                                getParentContainer(SensitivityUI.class).getS=
ensitivityTabUI().setTreeModel();
-                            } catch (StorageException ex) {
-                                log.debug(ex.getMessage(), ex);
-                            };
-                        }
-                        getParentContainer(WelcomePanelUI.class).setInfoText=
(_("isisfish.message.region.loaded"));
-                    }
-                });
-           	}
-        }
+    if (getContextValue(SimulAction.class).getSimulationParameter().getUseAn=
alysePlan()){
+        SimulUI simul =3D getParentContainer(SimulUI.class);
+        simul.enableAnalysePlan();
     }
-    public void setSimulationParameter(SimulAction simulAction){
-       getContextValue(SimulAction.class).setSimulationParameter(simulAction=
.getSimulationParameter());
-    }
-    protected void loadOldSimulation(){
-        final String selected =3D fieldSimulParamsSelect.getSelectedItem().t=
oString();
+}
+protected void regionChange(ItemEvent e){
+    if (e.getStateChange() =3D=3D ItemEvent.SELECTED) {
         // le premier item est " " pour ne pas avoir de selection par defaut
-        if (selected !=3D null && !selected.equals(" ")){        =09
-        	getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.me=
ssage.loading.old.simulation"));
-                SwingUtilities.invokeLater(new Runnable() {
+        final String selected =3D fieldSimulParamsRegion.getSelectedItem().t=
oString();
+        if (log.isDebugEnabled()) {
+            log.debug(" selected " + selected);
+        }
+        if(selected !=3D null && !selected.trim().isEmpty()) {
+            getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish=
.message.loading.region"));
+            SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    getContextValue(SimulAction.class).loadOldSimulation(sel=
ected);
+                    getContextValue(SimulAction.class).regionChange(selected=
);
                     refresh();
-                    getParentContainer(WelcomePanelUI.class).setInfoText(_("=
isisfish.message.old.simulation.loaded"));
+                    if (isSensitivity()){
+                        try {
+                            getParentContainer(SensitivityUI.class).getSensi=
tivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class=
).getSimulationParameter().getRegion().getFisheryRegion());
+                            getParentContainer(SensitivityUI.class).getSensi=
tivityTabUI().setTreeModel();
+                        } catch (StorageException ex) {
+                            log.debug(ex.getMessage(), ex);
+                        };
+                    }
+                    getParentContainer(WelcomePanelUI.class).setInfoText(_("=
isisfish.message.region.loaded"));
                 }
             });
-           =20
         }
     }
-    protected void addRules(){
-       getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSe=
lect.getSelectedItem().toString());
-       setRulesItems();
+}
+public void setSimulationParameter(SimulAction simulAction){
+   getContextValue(SimulAction.class).setSimulationParameter(simulAction.get=
SimulationParameter());
+}
+protected void loadOldSimulation(){
+    final String selected =3D fieldSimulParamsSelect.getSelectedItem().toStr=
ing();
+    // le premier item est " " pour ne pas avoir de selection par defaut
+    if (selected !=3D null && !selected.equals(" ")){
+        getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.mes=
sage.loading.old.simulation"));
+            SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                getContextValue(SimulAction.class).loadOldSimulation(selecte=
d);
+                refresh();
+                getParentContainer(WelcomePanelUI.class).setInfoText(_("isis=
fish.message.old.simulation.loaded"));
+            }
+        });
+
     }
-    protected void removeRules(){
-       getContextValue(SimulAction.class).removeRules(listSimulParamsMesures=
List.getSelectedValue().toString());
-       setRulesItems();
+}
+protected void addRules(){
+   getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect=
.getSelectedItem().toString());
+   setRulesItems();
+}
+protected void removeRules(){
+   getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList=
.getSelectedValue().toString());
+   setRulesItems();
+}
+protected void clearRules(){
+   getContextValue(SimulAction.class).getSimulationParameter().clearRules();
+   setRulesItems();
+}
+protected void simul(){
+    if (!isSensitivity()){
+        getContextValue(SimulAction.class).launchSimulation(fieldSimulParams=
Name.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
-    protected void clearRules(){
-       getContextValue(SimulAction.class).getSimulationParameter().clearRule=
s();
-       setRulesItems();
+    else{
+        getContextValue(SimulAction.class).launchSimulationWhithSensibility(=
fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelect=
edItem());
     }
-    protected void simul(){
-        if (!isSensitivity()){
-            getContextValue(SimulAction.class).launchSimulation(fieldSimulPa=
ramsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
-        }
-        else{
-            getContextValue(SimulAction.class).launchSimulationWhithSensibil=
ity(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSe=
lectedItem());
-        }
-        getParentContainer(WelcomeTabUI.class).selTab(5);
+    getParentContainer(WelcomeTabUI.class).selTab(5);
+}
+protected void enablePreSimul(){
+    if (fieldUseSimulPreScripts.isSelected()){
+        SimulUI simul =3D getParentContainer(SimulUI.class);
+        simul.enablePreSimul();
     }
-    protected void enablePreSimul(){
-        if (fieldUseSimulPreScripts.isSelected()){
-            SimulUI simul =3D getParentContainer(SimulUI.class);
-            simul.enablePreSimul();
-        }
+}
+protected void enableAnalysePlan(){
+    if (fieldSimulUseAnalysePlan.isSelected()){
+        getContextValue(SimulAction.class).getSimulationParameter().setUseAn=
alysePlan(true);
+        SimulUI simul =3D getParentContainer(SimulUI.class);
+        simul.enableAnalysePlan();
     }
-    protected void enableAnalysePlan(){
-        if (fieldSimulUseAnalysePlan.isSelected()){
-            getContextValue(SimulAction.class).getSimulationParameter().setU=
seAnalysePlan(true);
-            SimulUI simul =3D getParentContainer(SimulUI.class);
-            simul.enableAnalysePlan();
-        }
-        else{
-            getContextValue(SimulAction.class).getSimulationParameter().setU=
seAnalysePlan(false);
-        }
+    else{
+        getContextValue(SimulAction.class).getSimulationParameter().setUseAn=
alysePlan(false);
     }
-    protected void enableOnlyExport(){
-        if (fieldSimulOnlyExport.isSelected()){
-            getContextValue(SimulAction.class).getSimulationParameter().setO=
nlyExport(true);
-        }
-        else{
-            getContextValue(SimulAction.class).getSimulationParameter().setO=
nlyExport(false);
-        }
+}
+protected void enableOnlyExport(){
+    if (fieldSimulOnlyExport.isSelected()){
+        getContextValue(SimulAction.class).getSimulationParameter().setOnlyE=
xport(true);
     }
-    protected void setNbAnnees(){
-        getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnn=
ees.getText());
+    else{
+        getContextValue(SimulAction.class).getSimulationParameter().setOnlyE=
xport(false);
     }
-    protected void setListSimulParamsStrategiesItems(){
-        DefaultListModel listSimulParamsStrategiesModel =3D new DefaultListM=
odel();
-        java.util.List<Strategy> strategies =3D getContextValue(SimulAction.=
class).getStrategies();
-        for (Strategy s : strategies){
-            listSimulParamsStrategiesModel.addElement(s);
-        }
-        listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
-        java.util.List<Strategy> strategiesSelected =3D getContextValue(Simu=
lAction.class).getSimulationParameter().getStrategies();
-        if (listSimulParamsStrategiesModel.size() !=3D 0){
-            int[] indexs =3D new int[listSimulParamsStrategiesModel.size()];
-            int i =3D 0;
-            for (Strategy s : strategiesSelected){
-                indexs[i] =3D listSimulParamsStrategiesModel.indexOf(s);
-                i++;
-            }
-            listSimulParamsStrategies.setSelectedIndices(indexs);
-            strategySelected();
-        }
+}
+protected void setNbAnnees(){
+    getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.=
getText());
+}
+protected void setListSimulParamsStrategiesItems(){
+    DefaultListModel listSimulParamsStrategiesModel =3D new DefaultListModel=
();
+    java.util.List<Strategy> strategies =3D getContextValue(SimulAction.clas=
s).getStrategies();
+    for (Strategy s : strategies){
+        listSimulParamsStrategiesModel.addElement(s);
     }
-    protected void setListSimulParamsPopulationsItems(){
-        DefaultListModel listSimulParamsPopulationsModel =3D new DefaultList=
Model();
-        java.util.List<Population> populations =3D getContextValue(SimulActi=
on.class).getPopulations();
-        for (Population p : populations){
-            listSimulParamsPopulationsModel.addElement(p);
+    listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
+    java.util.List<Strategy> strategiesSelected =3D getContextValue(SimulAct=
ion.class).getSimulationParameter().getStrategies();
+    if (listSimulParamsStrategiesModel.size() !=3D 0){
+        int[] indexs =3D new int[listSimulParamsStrategiesModel.size()];
+        int i =3D 0;
+        for (Strategy s : strategiesSelected){
+            indexs[i] =3D listSimulParamsStrategiesModel.indexOf(s);
+            i++;
         }
-        listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
-        java.util.List<Population> populationsSelected =3D getContextValue(S=
imulAction.class).getSimulationParameter().getPopulations();
-        if (listSimulParamsPopulationsModel.size() !=3D 0){
-            int[] indexs =3D new int[listSimulParamsPopulationsModel.size()];
-            int i =3D 0;
-            for (Population p : populationsSelected){
-                indexs[i] =3D listSimulParamsPopulationsModel.indexOf(p);
-                i++;
-            }
-            listSimulParamsPopulations.setSelectedIndices(indexs);
-            populationSelected();
-        }
+        listSimulParamsStrategies.setSelectedIndices(indexs);
+        strategySelected();
     }
-    protected void setRulesItems(){
-       listSimulParamsMesuresList.setListData(getContextValue(SimulAction.cl=
ass).getRules().toArray());
-       setRulesButton();
+}
+protected void setListSimulParamsPopulationsItems(){
+    DefaultListModel listSimulParamsPopulationsModel =3D new DefaultListMode=
l();
+    java.util.List<Population> populations =3D getContextValue(SimulAction.c=
lass).getPopulations();
+    for (Population p : populations){
+        listSimulParamsPopulationsModel.addElement(p);
     }
-    protected void populationSelected(){
-        if (listSimulParamsPopulations.getSelectedIndex() !=3D -1){
-            getContextValue(SimulAction.class).setPopulations(listSimulParam=
sPopulations.getSelectedValues());
-            simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).=
getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.=
getSelectedValue()));
+    listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
+    java.util.List<Population> populationsSelected =3D getContextValue(Simul=
Action.class).getSimulationParameter().getPopulations();
+    if (listSimulParamsPopulationsModel.size() !=3D 0){
+        int[] indexs =3D new int[listSimulParamsPopulationsModel.size()];
+        int i =3D 0;
+        for (Population p : populationsSelected){
+            indexs[i] =3D listSimulParamsPopulationsModel.indexOf(p);
+            i++;
         }
+        listSimulParamsPopulations.setSelectedIndices(indexs);
+        populationSelected();
     }
-    protected void strategySelected(){
-        getContextValue(SimulAction.class).setStrategies(listSimulParamsStra=
tegies.getSelectedValues());
+}
+protected void setRulesItems(){
+   listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class)=
.getRules().toArray());
+   setRulesButton();
+}
+protected void populationSelected(){
+    if (listSimulParamsPopulations.getSelectedIndex() !=3D -1){
+        getContextValue(SimulAction.class).setPopulations(listSimulParamsPop=
ulations.getSelectedValues());
+        simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getS=
imulationParameter().getNumberOf((Population) listSimulParamsPopulations.getS=
electedValue()));
     }
-    protected void saveDescription(){
-        getContextValue(SimulAction.class).getSimulationParameter().setDescr=
iption(fieldSimulParamsDesc.getText());
-    }
-    protected void setRulesButton(){
-       if (getContextValue(SimulAction.class).getRules().toArray().length =
=3D=3D 0){
-           buttonSimulParamsMesuresClear.setEnabled(false);
-           buttonSimulParamsMesuresRemove.setEnabled(false);
-       }
-       else{
-            if (listSimulParamsMesuresList.getSelectedIndex() !=3D -1){
-                buttonSimulParamsMesuresRemove.setEnabled(true);
-                setSimulParamsRulesModel();
-            }
-            buttonSimulParamsMesuresClear.setEnabled(true);
-       }
-    }
-     protected void setSimulParamsRulesModel(){
-        DefaultTableModel model =3D new DefaultTableModel();
-        Map<String, Class> values;
+}
+protected void strategySelected(){
+    getContextValue(SimulAction.class).setStrategies(listSimulParamsStrategi=
es.getSelectedValues());
+}
+protected void saveDescription(){
+    getContextValue(SimulAction.class).getSimulationParameter().setDescripti=
on(fieldSimulParamsDesc.getText());
+}
+protected void setRulesButton(){
+   if (getContextValue(SimulAction.class).getRules().toArray().length =3D=3D=
 0){
+       buttonSimulParamsMesuresClear.setEnabled(false);
+       buttonSimulParamsMesuresRemove.setEnabled(false);
+   }
+   else{
         if (listSimulParamsMesuresList.getSelectedIndex() !=3D -1){
-            values =3D getContextValue(SimulAction.class).getRuleParameterNa=
me(listSimulParamsMesuresList.getSelectedValue().toString());
-            model =3D new DefaultTableModel(){
-                    @Override
-                    public boolean isCellEditable(int row, int column) {
-                        boolean result =3D false;
-                        if (column > 0){
-                            result =3Dtrue;
-                        }
-                        return result;
+            buttonSimulParamsMesuresRemove.setEnabled(true);
+            setSimulParamsRulesModel();
+        }
+        buttonSimulParamsMesuresClear.setEnabled(true);
+   }
+}
+ protected void setSimulParamsRulesModel(){
+    DefaultTableModel model =3D new DefaultTableModel();
+    Map<String, Class> values;
+    if (listSimulParamsMesuresList.getSelectedIndex() !=3D -1){
+        values =3D getContextValue(SimulAction.class).getRuleParameterName(l=
istSimulParamsMesuresList.getSelectedValue().toString());
+        model =3D new DefaultTableModel(){
+                @Override
+                public boolean isCellEditable(int row, int column) {
+                    boolean result =3D false;
+                    if (column > 0){
+                        result =3Dtrue;
                     }
-                };
-            java.util.List<Object> properties =3D new ArrayList<Object>();
-            java.util.List<GenericCell> cells =3D new ArrayList<GenericCell>=
();
-            for (Iterator<String> it =3D values.keySet().iterator(); it.hasN=
ext();) {
-                String name =3D it.next();
-                Object propertie =3D getContextValue(SimulAction.class).getR=
uleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toStrin=
g());
-                GenericCell value =3D new GenericCell(name, values.get(name)=
, null);
-                properties.add(propertie);
-                cells.add(value);
-            }
-            model.addColumn("Name", cells.toArray());
-            model.addColumn("Value", properties.toArray());
+                    return result;
+                }
+            };
+        java.util.List<Object> properties =3D new ArrayList<Object>();
+        java.util.List<GenericCell> cells =3D new ArrayList<GenericCell>();
+        for (Iterator<String> it =3D values.keySet().iterator(); it.hasNext(=
);) {
+            String name =3D it.next();
+            Object propertie =3D getContextValue(SimulAction.class).getRuleP=
arameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString());
+            GenericCell value =3D new GenericCell(name, values.get(name), nu=
ll);
+            properties.add(propertie);
+            cells.add(value);
         }
-        simulParamsRules.setModel(model);
-        ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
-        cellEditor.setRegion(getContextValue(SimulAction.class).getRegionSto=
rage());
-        simulParamsRules.getColumnModel().getColumn(1).setCellEditor(cellEdi=
tor);
-        simulParamsRules.getModel().addTableModelListener(new TableModelList=
ener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                int row =3D e.getFirstRow();
-                TableModel model =3D (TableModel)e.getSource();
-                GenericCell data =3D (GenericCell) model.getValueAt(row, 0);
-                getContextValue(SimulAction.class).setRuleParameterValue(dat=
a.getName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.=
getValueAt(row, 1));
-            }
-        });
+        model.addColumn("Name", cells.toArray());
+        model.addColumn("Value", properties.toArray());
     }
-    protected void selectFilter(){
-        try {
-            getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifrem=
er.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getCont=
extValue(SimulAction.class).getOldSimulationItem()));
-            refresh();
-        } catch (ParseException ex) {
-            Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, nul=
l, ex);
-        } catch (IOException ex) {
-            Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, nul=
l, ex);
+    simulParamsRules.setModel(model);
+    ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
+    cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage=
());
+    simulParamsRules.getColumnModel().getColumn(1).setCellEditor(cellEditor);
+    simulParamsRules.getModel().addTableModelListener(new TableModelListener=
() {
+        @Override
+        public void tableChanged(TableModelEvent e) {
+            int row =3D e.getFirstRow();
+            TableModel model =3D (TableModel)e.getSource();
+            GenericCell data =3D (GenericCell) model.getValueAt(row, 0);
+            getContextValue(SimulAction.class).setRuleParameterValue(data.ge=
tName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.getV=
alueAt(row, 1));
         }
+    });
+}
+protected void selectFilter(){
+    try {
+        getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.i=
sisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextV=
alue(SimulAction.class).getOldSimulationItem()));
+        refresh();
+    } catch (ParseException ex) {
+        Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, e=
x);
+    } catch (IOException ex) {
+        Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, e=
x);
     }
-    protected ComboBoxModel getSimulParamsSelectModel() {
-        return getSimulParamsSelectModel(false);
-    }
-    protected ComboBoxModel getSimulParamsSelectModel(boolean force) {
-        java.util.List<String> items =3D getContextValue(SimulAction.class).=
getFilteredOldSimulatorNames(force);
-        DefaultComboBoxModel result =3D new DefaultComboBoxModel();
-        if (items !=3D null){
-            for (String s : items){
-                result.addElement(s);
-            }
+}
+protected ComboBoxModel getSimulParamsSelectModel() {
+    return getSimulParamsSelectModel(false);
+}
+protected ComboBoxModel getSimulParamsSelectModel(boolean force) {
+    java.util.List<String> items =3D getContextValue(SimulAction.class).getF=
ilteredOldSimulatorNames(force);
+    DefaultComboBoxModel result =3D new DefaultComboBoxModel();
+    if (items !=3D null){
+        for (String s : items){
+            result.addElement(s);
         }
-        return result;
     }
-    protected void resetFilter(){
-        getContextValue(SimulAction.class).resetOldSimulatorNames();
-    }
-    protected void saveName(){
-        getContextValue(SimulAction.class).setName(fieldSimulParamsName.getT=
ext());
-    }
-    public Element save(){
-        Element result =3D DocumentHelper.createElement("paramsUI");
-        for (String name : $objectMap.keySet()){
-            Object o =3D $objectMap.get(name);
-            if (!name.matches("^\\$.*")){
-                Element child =3D DocumentHelper.createElement(name);
-                if (JComboBox.class.isInstance(o)){
-                    Object value =3D ((JComboBox)o).getSelectedItem();
-                    child.addAttribute("value", value.toString());
+    return result;
+}
+protected void resetFilter(){
+    getContextValue(SimulAction.class).resetOldSimulatorNames();
+}
+protected void saveName(){
+    getContextValue(SimulAction.class).setName(fieldSimulParamsName.getText(=
));
+}
+public Element save(){
+    Element result =3D DocumentHelper.createElement("paramsUI");
+    for (String name : $objectMap.keySet()){
+        Object o =3D $objectMap.get(name);
+        if (!name.matches("^\\$.*")){
+            Element child =3D DocumentHelper.createElement(name);
+            if (JComboBox.class.isInstance(o)){
+                Object value =3D ((JComboBox)o).getSelectedItem();
+                child.addAttribute("value", value.toString());
+            }
+            if (JList.class.isInstance(o)){
+                Object[] values =3D ((JList)o).getSelectedValues();
+                for (Object value : values){
+                    child.add(DocumentHelper.createElement("item").addAttrib=
ute("value", value.toString()));
                 }
-                if (JList.class.isInstance(o)){
-                    Object[] values =3D ((JList)o).getSelectedValues();
-                    for (Object value : values){
-                        child.add(DocumentHelper.createElement("item").addAt=
tribute("value", value.toString()));
-                    }
-                }
-                else if (JTextComponent.class.isInstance(o)){
-                    child.addText(((JTextComponent)o).getText());
-                }
-                else if (AbstractButton.class.isInstance(o)){
-                    child.addAttribute("selected", ((AbstractButton)o).isSel=
ected() + "");
-                }
-                else if (JTable.class.isInstance(o)){
-                    JTable table =3D (JTable)o;
-                    for (int i=3D0;i<table.getColumnCount();i++){
-                        Element column =3D DocumentHelper.createElement("col=
umn");
-                        for (int j=3D0;j<table.getRowCount();j++){
-                            Element row =3D DocumentHelper.createElement("ro=
w");
-                            Object value =3D table.getValueAt(j, i);
-                            if (value !=3D null){
-                                row.add(DocumentHelper.createElement("cell")=
.addAttribute("value", value.toString()));
-                            }
-                            else {
-                                row.add(DocumentHelper.createElement("cell")=
.addAttribute("value", null));
-                            }
-                            column.add(row);
+            }
+            else if (JTextComponent.class.isInstance(o)){
+                child.addText(((JTextComponent)o).getText());
+            }
+            else if (AbstractButton.class.isInstance(o)){
+                child.addAttribute("selected", ((AbstractButton)o).isSelecte=
d() + "");
+            }
+            else if (JTable.class.isInstance(o)){
+                JTable table =3D (JTable)o;
+                for (int i=3D0;i<table.getColumnCount();i++){
+                    Element column =3D DocumentHelper.createElement("column"=
);
+                    for (int j=3D0;j<table.getRowCount();j++){
+                        Element row =3D DocumentHelper.createElement("row");
+                        Object value =3D table.getValueAt(j, i);
+                        if (value !=3D null){
+                            row.add(DocumentHelper.createElement("cell").add=
Attribute("value", value.toString()));
                         }
-                        child.add(column);
+                        else {
+                            row.add(DocumentHelper.createElement("cell").add=
Attribute("value", null));
+                        }
+                        column.add(row);
                     }
+                    child.add(column);
                 }
-                result.add(child);
             }
+            result.add(child);
         }
-        return result;
     }
+    return result;
+}
     ]]>
     </script>
     <row>
@@ -421,7 +417,7 @@
                         <Table>
                             <row>
                                 <cell fill=3D"horizontal">
-                                    <JLabel text=3D"isisfish.params.simulati=
onName" minimumSize=3D'{new Dimension(140,25)}' preferredSize=3D'{new Dimensi=
on(140,25)}'/>
+                                    <JLabel id=3D'lblName' text=3D'{isSensit=
ivity() ? _("isisfish.params.sensibilityName") : _("isisfish.params.simulatio=
nName")}' minimumSize=3D'{new Dimension(140,25)}' preferredSize=3D'{new Dimen=
sion(140,25)}'/>
                                 </cell>
                                 <cell  fill=3D"both"  weightx=3D"1.0">
                                     <JTextField id=3D"fieldSimulParamsName" =
onFocusLost=3D'saveName()'/>
@@ -586,10 +582,10 @@
             <Table>
                 <row>
                     <cell fill=3D"horizontal" weightx=3D"0.3">
-                        <JCheckBox text=3D"isisfish.params.usePreSimulationS=
cript" id=3D"fieldUseSimulPreScripts" onItemStateChanged=3D'enablePreSimul()'=
/>
+                        <JCheckBox text=3D"isisfish.params.usePreSimulationS=
cript" id=3D"fieldUseSimulPreScripts" visible=3D'{!isSensitivity()}' onItemSt=
ateChanged=3D'enablePreSimul()'/>
                     </cell>
                     <cell fill=3D"horizontal" weightx=3D"0.3">
-                        <JCheckBox text=3D"isisfish.params.useAnalysePlan" i=
d=3D"fieldSimulUseAnalysePlan" onItemStateChanged=3D'enableAnalysePlan()'/>
+                        <JCheckBox text=3D"isisfish.params.useAnalysePlan" i=
d=3D"fieldSimulUseAnalysePlan" visible=3D'{!isSensitivity()}' onItemStateChan=
ged=3D'enableAnalysePlan()'/>
                     </cell>
                     <cell fill=3D"horizontal" weightx=3D"0.3">
                         <JCheckBox text=3D"isisfish.params.onlyExportSimulat=
ion" id=3D"fieldSimulOnlyExport" onItemStateChanged=3D'enableOnlyExport()'/>

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.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/i18n/isis-fish-en_GB.properties	2009-0=
3-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
3-12 11:44:11 UTC (rev 1949)
@@ -625,6 +625,8 @@
 isisfish.params.onlyExportSimulation=3DOnly export simulation
 isisfish.params.populationNumbers=3DPopulation numbers input
 isisfish.params.ruleParameters=3DRule's parameters
+isisfish.params.sensibility=3DSensibility
+isisfish.params.sensibilityName=3DSensitivity name
 isisfish.params.simulationName=3DSimulation name
 isisfish.params.title=3DParameters
 isisfish.params.toString.fishery=3DP\u00EAcherie\: %1$s\n\n
@@ -683,14 +685,14 @@
 isisfish.populationMigration.useEquation=3DUse equation
 isisfish.populationMigrationEmigration.coefficient=3DCoefficient
 isisfish.populationMigrationEmigration.departureZone=3DDeparture Zone
-isisfish.populationMigrationEmigration.title=3D
+isisfish.populationMigrationEmigration.title=3DPopulation emigration
 isisfish.populationMigrationImmigration.arrivalZone=3DArrival Zone
 isisfish.populationMigrationImmigration.coefficient=3DCoefficient
-isisfish.populationMigrationImmigration.title=3D
+isisfish.populationMigrationImmigration.title=3DPopulation immigration
 isisfish.populationMigrationMigration.arrivalZone=3DArrival Zone
 isisfish.populationMigrationMigration.coefficient=3DCoefficient
 isisfish.populationMigrationMigration.departureZone=3DDeparture Zone
-isisfish.populationMigrationMigration.title=3D
+isisfish.populationMigrationMigration.title=3DPopulation migration
 isisfish.populationRecruitment.comments=3DComments
 isisfish.populationRecruitment.recruitmentDistribution=3DRecruitment Distrib=
ution
 isisfish.populationRecruitment.reproductionEquation=3DReproductionEquation

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.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/i18n/isis-fish-fr_FR.properties	2009-0=
3-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
3-12 11:44:11 UTC (rev 1949)
@@ -625,6 +625,8 @@
 isisfish.params.onlyExportSimulation=3DExporter uniquement des simulations
 isisfish.params.populationNumbers=3DDonn\u00E9es de population
 isisfish.params.ruleParameters=3DParam\u00E8tres des r\u00E8gles
+isisfish.params.sensibility=3DSensibilit\u00E9
+isisfish.params.sensibilityName=3DNom de l'analyse de sensibilit\u00E9
 isisfish.params.simulationName=3DNom de la simulation
 isisfish.params.title=3DParam\u00E8tres
 isisfish.params.toString.fishery=3DP\u00EAcherie\: %1$s\n\n
@@ -683,14 +685,14 @@
 isisfish.populationMigration.useEquation=3DUtiliser l'\u00E9quation
 isisfish.populationMigrationEmigration.coefficient=3DCoefficient
 isisfish.populationMigrationEmigration.departureZone=3DZone de d\u00E9part
-isisfish.populationMigrationEmigration.title=3D
+isisfish.populationMigrationEmigration.title=3DPopulation emmigration
 isisfish.populationMigrationImmigration.arrivalZone=3DZone d'arriv\u00E9e
 isisfish.populationMigrationImmigration.coefficient=3DCoefficient
-isisfish.populationMigrationImmigration.title=3D
+isisfish.populationMigrationImmigration.title=3DPopulation immigration
 isisfish.populationMigrationMigration.arrivalZone=3DZone d'arriv\u00E9e
 isisfish.populationMigrationMigration.coefficient=3DCoefficient
 isisfish.populationMigrationMigration.departureZone=3DZone de d\u00E9part
-isisfish.populationMigrationMigration.title=3D
+isisfish.populationMigrationMigration.title=3DPopulation migration
 isisfish.populationRecruitment.comments=3DCommentaires
 isisfish.populationRecruitment.recruitmentDistribution=3DDistribution du rec=
rutement
 isisfish.populationRecruitment.reproductionEquation=3DEquation de reproducti=
on
@@ -855,7 +857,7 @@
 isisfish.sensWizardPanels.values=3DValeurs
 isisfish.sensibilityWizard.title=3DSensibility Wizard
 isisfish.sensitivity.title=3DS\u00E9lection des facteurs
-isisfish.sensitivityChooser.title=3DS\u00E9lection des sensibilit\u00E9es
+isisfish.sensitivityChooser.title=3DParam\u00E8tres de la sensibilit\u00E9
 isisfish.server.ssh.generateKey.title=3DG\u00E9n\u00E9rer une cl\u00E9 SSH
 isisfish.setOfVessels.comments=3DCommentaires
 isisfish.setOfVessels.fixedCosts=3DCo\u00FBts fixes

Modified: isis-fish/trunk/src/main/resources/icons/building.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: isis-fish/trunk/src/main/resources/icons/building_add.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============8307883857639575622==--