From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:59 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2002 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input	sensitivity
 simulator
Date: Wed, 18 Mar 2009 21:43:04 +0100
Message-ID: <20090318204304.E4EAE461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8718211798227807000=="

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

Author: sletellier
Date: 2009-03-18 20:43:04 +0000 (Wed, 18 Mar 2009)
New Revision: 2002

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationC=
ontinuousPanel.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.=
jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHel=
per.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAct=
ion.java
   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=
tyChooserUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction=
.java
Log:
Equation continuous is enabled

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-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-03-18 20:43:04 UTC (rev 2002)
@@ -22,6 +22,15 @@
                         accept(e);
                      }
                      }}' />
+    <jaxx.runtime.swing.BlockingLayerUI2 id=3D'layerUI2'
+                         blockIcon=3D'{SwingUtil.createImageIcon("building.p=
ng")}'
+                         acceptIcon=3D'{SwingUtil.createImageIcon("building_=
add.png")}'
+                         acceptAction=3D'{new AbstractAction() { private sta=
tic final long serialVersionUID =3D 1L;
+                         @Override
+                         public void actionPerformed(ActionEvent e) {
+                            accept(e);
+                         }
+                         }}' />
=20
     <script><![CDATA[
 import fr.ifremer.isisfish.ui.WelcomePanelUI;
@@ -68,12 +77,18 @@
             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 =3D null;
+            if (isSensitivity){
+               jaxx.runtime.swing.BlockingLayerUI2 ui =3D active ? layerUI2.=
clone() : null;
+                SwingUtil.getLayer(boxed).setUI(ui);
+            } else {
+                jaxx.runtime.swing.BlockingLayerUI ui =3D active ? layerUI.c=
lone() : null;
+                if (classBean =3D=3D null && ui !=3D null){
+                    ui.setBlock(true);
+                }
+                ui.setUseIcon(isSensitivity && isActif());
+                SwingUtil.getLayer(boxed).setUI(ui);
             }
-            ui.setUseIcon(isSensitivity && isActif());
-            SwingUtil.getLayer(boxed).setUI(ui);
         }
     }
 }

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-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-18 20:43:04 UTC (rev 2002)
@@ -22,6 +22,7 @@
 import fr.ifremer.isisfish.entities.Selectivity;
 import fr.ifremer.isisfish.entities.TargetSpecies;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDoma=
in;
 import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.ui.input.InputAction;
@@ -189,16 +190,14 @@
             DefaultContinuousPanel continuousPanel =3D null;
             if (c instanceof InputOneEquationUI){
                 InputOneEquationUI origine =3D (InputOneEquationUI) c;
-                InputOneEquationUI ui =3D new InputOneEquationUI(new JAXXIni=
tialContext().add(new InputAction()));
+                EquationContinuousPanel ui =3D new EquationContinuousPanel(n=
ew JAXXInitialContext().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;
+                result =3D ui;
             } else if (c instanceof MatrixPanelEditor){
                 MatrixContinuousPanel matrixPanel =3D new MatrixContinuousPa=
nel();
                 matrixPanel.setMatrix((MatrixND)callMethod(e, fieldName));
@@ -208,7 +207,9 @@
                 continuousPanel =3D new DefaultContinuousPanel();
                 result =3D continuousPanel;
             }
-            continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEditor(=
c, e));
+            if (continuousPanel !=3D null){
+                continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEdi=
tor(c, e));
+            }
         } catch (Exception ex) {
             Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE,=
 null, ex);
         }
@@ -228,16 +229,19 @@
             DefaultContinuousPanel continuousPanel =3D null;
             if (c instanceof InputOneEquationUI){
                 InputOneEquationUI origine =3D (InputOneEquationUI) c;
-                InputOneEquationUI ui =3D new InputOneEquationUI(new JAXXIni=
tialContext().add(new InputAction()));
+                EquationContinuousPanel ui =3D new EquationContinuousPanel(n=
ew JAXXInitialContext().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;
+                ui.setBean(origine.getBean());
+
+                EquationContinuousDomain equationDomain =3D (EquationContinu=
ousDomain)domain;
+                ui.addDomain(equationDomain);
+                ui.setTable();
+
+                result =3D ui;
             } else if (c instanceof MatrixPanelEditor){
                 MatrixContinuousPanel panel =3D new MatrixContinuousPanel();
                 MatrixContinuousDomain matrixDomain =3D (MatrixContinuousDom=
ain)domain;
@@ -249,7 +253,9 @@
                 continuousPanel =3D new DefaultContinuousPanel();
                 result =3D continuousPanel;
             }
-             continuousPanel.init(new JTextField(String.valueOf(domain.getMi=
nBound())), new JTextField(String.valueOf(domain.getMaxBound())));
+            if (continuousPanel !=3D null){
+                continuousPanel.init(new JTextField(String.valueOf(domain.ge=
tMinBound())), new JTextField(String.valueOf(domain.getMaxBound())));
+            }
         } catch (Exception ex) {
             Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE,=
 null, ex);
         }
@@ -397,7 +403,7 @@
          result =3D ((JRadioButton)c).isSelected();
=20
     } else if (c instanceof InputOneEquationUI){
-          result =3D ((InputOneEquationUI) c).getFormule();
+          result =3D ((InputOneEquationUI) c).getEditor().getText();
=20
     } else if (c instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e=
, fieldName)));
@@ -463,8 +469,10 @@
     if (c instanceof JTextComponent) {
         if (Double.class.isInstance(o)){
             return true;
-        }  else if (Long.class.isInstance(o)){
+        } else if (Long.class.isInstance(o)){
             return true;
+        } else if (InputOneEquationUI.class.isInstance(c)){
+            return true;
         }
     }
     return false;

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Equat=
ionContinuousPanel.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/Equation=
ContinuousPanel.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Equation=
ContinuousPanel.jaxx	2009-03-18 20:43:04 UTC (rev 2002)
@@ -0,0 +1,246 @@
+<!--
+/* *##%
+ * Copyright (C) 2005
+ *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+
+/* *
+ * IsisFish.java
+ *
+ * Created: 1 aout 2005 18:37:25 CEST
+ *
+ * @author Benjamin POUSSIN <poussin at codelutin.com>
+ * @version $Revision: 1312 $
+ *
+ * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
+ * by : $Author: sletellier $
+ */
+ -->
+<ContinuousPanelContainer>
+
+    <!-- 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'/>
+
+     <script><![CDATA[
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableModel;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableModel;
+
+protected String[] columnNames =3D {"Name", "Min", "Max", "Operator", "Actio=
n"};
+protected java.util.List<EquationContinuousDomain> datas =3D new ArrayList<E=
quationContinuousDomain>();
+protected java.util.List<JComboBox> operateurs =3D new ArrayList<JComboBox>(=
);
+protected java.util.List<JButton> actions =3D new ArrayList<JButton>();
+
+public java.util.List<EquationContinuousDomain> getDomains(){
+    return datas;
+}
+public void setDomains(java.util.List<EquationContinuousDomain> domains){
+    datas =3D domains;
+}
+public void addDomain(EquationContinuousDomain domain){
+    datas.add(domain);
+}
+protected AbstractTableModel getTableModel(){
+    AbstractTableModel model =3D new AbstractTableModel() {
+
+        @Override
+        public int getRowCount() {
+            return datas.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return columnNames.length;
+        }
+
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return true;
+        }
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            if (columnIndex =3D=3D 0){
+                return datas.get(rowIndex).getVariableName();
+            } else if (columnIndex =3D=3D 1){
+                return datas.get(rowIndex).getMinBound();
+            } else if (columnIndex =3D=3D 2){
+                return datas.get(rowIndex).getMaxBound();
+            } else if (columnIndex =3D=3D 3){
+                return datas.get(rowIndex).getOperator();
+            } else if (columnIndex =3D=3D 4){
+                return _("isisfish.factor.validDiscretNumber");
+            }
+            return null;
+        }
+
+        @Override
+        public void setValueAt(Object aValue, int rowIndex, int columnIndex)=
 {
+            if (String.class.isInstance(aValue)){
+                if (!((String)aValue).equals("")){
+                    if (columnIndex =3D=3D 0){
+                        datas.get(rowIndex).setVariableName((String)aValue);
+                    } else if (columnIndex =3D=3D 1){
+                        datas.get(rowIndex).setMinBound(Long.parseLong((Stri=
ng)aValue));
+                    } else if (columnIndex =3D=3D 2){
+                        datas.get(rowIndex).setMaxBound(Long.parseLong((Stri=
ng)aValue));
+                    } else if (columnIndex =3D=3D 3){
+                        datas.get(rowIndex).setOperator((String)aValue);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public String getColumnName(int col) {
+            return columnNames[col].toString();
+        }
+
+    };
+    return model;
+}
+protected JComboBox getOperateur(){
+    JComboBox result =3D new JComboBox();
+    result.addItem("+");
+    result.addItem("-");
+    result.addItem("*");
+    result.addItem("/");
+    operateurs.add(result);
+    result.addActionListener(new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            JComboBox source =3D (JComboBox)e.getSource();
+            int i =3D operateurs.indexOf(source);
+            datas.get(i).setOperator((String)source.getSelectedItem());
+        }
+    });
+    return result;
+}
+protected void newButton(){
+    JButton result =3D new JButton();
+    result.setText(_("isisfish.factor.validDiscretNumber"));
+    actions.add(result);
+    result.addActionListener(new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            JButton source =3D (JButton)e.getSource();
+            int i =3D actions.indexOf(source);
+            valid(i);
+        }
+    });
+}
+protected JButton getActionButton(int i){
+    return actions.get(i);
+}
+protected void valid(int i){
+    String variableName =3D datas.get(i).getVariableName();
+    String text =3D editor.getEditor().getText().replaceAll(variableName, "g=
etContextOf(" + variableName);
+    editor.getEditor().setText(text);
+}
+protected void setTable(){
+    params.setModel(getTableModel());
+    params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor=
(getOperateur()));
+    params.getColumnModel().getColumn(4).setCellEditor(new TableCellEditor()=
 {
+
+        @Override
+        public Component getTableCellEditorComponent(JTable table, Object va=
lue, boolean isSelected, int row, int column) {
+            return getActionButton(row);
+        }
+
+        @Override
+        public Object getCellEditorValue() {
+            return null;
+        }
+
+        @Override
+        public boolean isCellEditable(EventObject anEvent) {
+            return true;
+        }
+
+        @Override
+        public boolean shouldSelectCell(EventObject anEvent) {
+            return true;
+        }
+
+        @Override
+        public boolean stopCellEditing() {
+            return true;
+        }
+
+        @Override
+        public void cancelCellEditing() {
+        }
+
+        @Override
+        public void addCellEditorListener(CellEditorListener l) {
+        }
+
+        @Override
+        public void removeCellEditorListener(CellEditorListener l) {
+        }
+    });
+}
+protected void add(){
+    datas.add(new EquationContinuousDomain());
+    newButton();
+    setTable();
+}
+protected void remove(){
+    int i =3D params.getSelectedRow();
+    datas.remove(i);
+    operateurs.remove(i);
+    actions.remove(i);
+    setTable();
+}
+     ]]>
+     </script>
+    <Table id=3D'content' constraints=3D'BorderLayout.CENTER'>
+        <row>
+            <cell fill=3D'both' columns=3D'2' weightx=3D'1' weighty=3D'0.5'>
+                <JScrollPane>
+                    <JTable id=3D'params' visible=3D'{isContinuePossible()}'=
 model=3D'{getTableModel()}' enabled=3D'{isContinueSelected()}'/>
+                </JScrollPane>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'add' text=3D'isisfish.common.add' visible=3D'=
{isContinuePossible()}' enabled=3D'{isContinueSelected()}' onActionPerformed=
=3D'add()'/>
+            </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'remove' text=3D'isisfish.common.remove' visib=
le=3D'{isContinuePossible()}' enabled=3D'{isContinueSelected()}' onActionPerf=
ormed=3D'remove()'/>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'both' columns=3D'2' weightx=3D'1' weighty=3D'0.5'>
+                <fr.ifremer.isisfish.ui.input.InputOneEquationUI id=3D'edito=
r' formule=3D'{getFormule()}' lblText=3D'{getLblText()}'
+                constructorParams=3D'this' bean=3D'{getBean()}' clazz=3D'{ge=
tClazz()}' methodGet=3D'{getMethodGet()}' actif=3D'{isContinueSelected()}'
+                methodSet=3D'{getMethodSet()}' nameEquation=3D'{getNameEquat=
ion()}' selectedEquation=3D'{getSelectedEquation()}'
+                visible=3D'{isContinuePossible()}' enabled=3D'{isContinueSel=
ected()}'/>
+            </cell>
+        </row>
+    </Table>
+</ContinuousPanelContainer>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Fa=
ctorAction.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/FactorAc=
tion.java	2009-03-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAc=
tion.java	2009-03-18 20:43:04 UTC (rev 2002)
@@ -18,6 +18,7 @@
=20
 package fr.ifremer.isisfish.ui.sensitivity;
=20
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
 import fr.ifremer.isisfish.ui.simulator.SimulAction;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -39,7 +40,13 @@
             String operateur =3D (String)matrixPanel.getOperator().getSelect=
edItem();
             action.addContinuousMatrixFactor(name, path, getMin(defaultPanel=
), getMax(defaultPanel), matrix, operateur, cOrigine, exist);
=20
-        }else if (DefaultContinuousPanel.class.isInstance(panel)){
+        } else if (EquationContinuousPanel.class.isInstance(panel)){
+            EquationContinuousPanel equationPanel =3D (EquationContinuousPan=
el)panel;
+            List<EquationContinuousDomain> domains =3D equationPanel.getDoma=
ins();
+            for (EquationContinuousDomain domain : domains){
+                action.addContinuousEquationFactor(name, path, domain, equat=
ionPanel.getEditor().getEditor().getText(), cOrigine, exist);
+            }
+        } else if (DefaultContinuousPanel.class.isInstance(panel)){
             defaultPanel =3D (DefaultContinuousPanel)panel;
             action.addContinuousFactor(name, path, getMin(defaultPanel), get=
Max(defaultPanel), cOrigine, exist);
         }

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-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWi=
zard.jaxx	2009-03-18 20:43:04 UTC (rev 2002)
@@ -55,6 +55,7 @@
 protected java.util.List<JComponent> discretComponents =3D new ArrayList<JCo=
mponent>();
 protected String path =3D null;
 protected ContinuousPanelContainer continuousPanel =3D null;
+protected Factor factor =3D null;
 addPropertyChangeListener("continuePossible", new PropertyChangeListener(){
=20
         @Override
@@ -124,6 +125,7 @@
     this.path =3D f.getPath();
     factorName.setText(f.getName());
     Domain domain =3D f.getDomain();
+    this.factor =3D f;
=20
     if (ContinuousDomain.class.isInstance(domain)){
         ContinuousDomain cDomain =3D (ContinuousDomain) domain;
@@ -193,7 +195,7 @@
     this.dispose();
 }
 protected void remove(){
-    getSimulAction().removeFactor(path);
+    getSimulAction().removeFactor(path, factor);
     getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel();
     this.dispose();
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityChooserUI.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=
ityChooserUI.jaxx	2009-03-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityChooserUI.jaxx	2009-03-18 20:43:04 UTC (rev 2002)
@@ -78,6 +78,15 @@
 protected void setTableModel(){
     Map<String, Class<?>> values =3D getSimulAction().getSensitivityParamete=
rNames((String)fieldSensitivitySelect.getSelectedItem());
     setParamsTable(values, simulSensitivityParam);
+    simulSensitivityParam.getModel().addTableModelListener(new TableModelLis=
tener() {
+        @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).setSensitivityParameterValue(=
data.getName(), model.getValueAt(row, 1));
+        }
+    });
 }
 public void setFactorCardinalityModel(){
     DefaultTableModel model =3D new DefaultTableModel(){
@@ -128,6 +137,16 @@
 protected void setExportParams(){
     Map<String, Class<?>> values =3D getAction().getSensitivityExportParamet=
erNames(getSelectedExport());
     setParamsTable(values, exportParams);
+
+    exportParams.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).setSensitivityExportParameter=
Names(getSelectedExport(), (String)data.getName(), model.getValueAt(row, 1));
+        }
+    });
 }
 protected void setParamsTable(Map<String, Class<?>> values, JTable table){
     int row =3D 0;
@@ -158,15 +177,6 @@
         ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
         cellEditor.setRegion(getContextValue(SimulAction.class).getRegionSto=
rage());
         table.getColumnModel().getColumn(1).setCellEditor(cellEditor);
-        table.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).setSensitivityParameterVa=
lue(data.getName(),  model.getValueAt(row, 1));
-            }
-        });
=20
     }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lAction.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/simulator/SimulActio=
n.java	2009-03-18 17:30:19 UTC (rev 2001)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2009-03-18 20:43:04 UTC (rev 2002)
@@ -678,6 +678,15 @@
     public Map<String, Class<?>> getSensitivityExportParameterNames(Sensitiv=
ityExport export){
         return ExportStorage.getParameterNames(export);
     }
+    public void setSensitivityExportParameterNames(Export export, String par=
amName, Object value){
+        if (value !=3D null){
+            try {
+                ExportStorage.setParameterValue(export, paramName, value);
+            } catch (IsisFishException ex) {
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+            }
+        }
+    }
     public List<String> getSensitivityName(){
         return SensitivityStorage.getSensitivityNames();
     }
@@ -703,7 +712,9 @@
     }
     public void setSensitivityParameterValue(String paramName, Object value){
         try {
-            SensitivityStorage.setParameterValue(param.getSensitivityCalcula=
tor(), paramName, value);
+            if (value !=3D null){
+                SensitivityStorage.setParameterValue(param.getSensitivityCal=
culator(), paramName, value);
+            }
         } catch (IsisFishException ex) {
             Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
             showMsgBox(ex);
@@ -730,8 +741,8 @@
         return result;
     }
     public void addFactor(String path, Factor f, JComponent c){
-        factors.put(path, f);
-        factorComponent.put(path, c);
+        factors.put(path + f.getName(), f);
+        factorComponent.put(path + f.getName(), c);
         designPlan.setFactors(getFactors());
     }
     public Factor<? extends Serializable>  getFactor(String name){
@@ -745,7 +756,7 @@
         f.setDomain(domain);
         f.setPath(path);
         if (exist)
-            removeFactor(path);
+            removeFactor(path, f);
         addFactor(path, f, c);
     }
     public void addDiscreteFactor(String name, String path, List<Serializabl=
e> values, JComponent c, boolean exist){
@@ -762,41 +773,38 @@
         f.setDomain(domain);
         f.setPath(path);
         if (exist)
-            removeFactor(path);
+            removeFactor(path, f);
         addFactor(path, f, c);
     }
-    public void addContinuousMatrixFactor(String name, String path, Serializ=
able min, Serializable max, MatrixND matrix, String operateur, JComponent c, =
boolean exist){
+    public void addContinuousEquationFactor(String name, String path, Equati=
onContinuousDomain domain, String equation, JComponent c, boolean exist){
         Factor f =3D new Factor(name);
-        MatrixContinuousDomain<Serializable> domain =3D new MatrixContinuous=
Domain<Serializable>();
-        domain.setMatrix(matrix);
-        domain.setOperator(operateur);
-        domain.setMaxBound(max);
-        domain.setMinBound(min);
+        f.setValue(equation);
         f.setDomain(domain);
         f.setPath(path);
         if (exist)
-            removeFactor(path);
+            removeFactor(path, f);
         addFactor(path, f, c);
     }
-    public void addContinuousEquationFactor(String name, String path, String=
 varName, Serializable min, Serializable max, MatrixND matrix, String operate=
ur, JComponent c, boolean exist){
+    public void addContinuousMatrixFactor(String name, String path, Serializ=
able min, Serializable max, MatrixND matrix, String operateur, JComponent c, =
boolean exist){
         Factor f =3D new Factor(name);
-        EquationContinuousDomain<Serializable> domain =3D new EquationContin=
uousDomain<Serializable>();
-        domain.setVariableName(varName);
+        MatrixContinuousDomain<Serializable> domain =3D new MatrixContinuous=
Domain<Serializable>();
+        domain.setMatrix(matrix);
         domain.setOperator(operateur);
         domain.setMaxBound(max);
         domain.setMinBound(min);
         f.setDomain(domain);
         f.setPath(path);
+        f.setValue(matrix);
         if (exist)
-            removeFactor(path);
+            removeFactor(path, f);
         addFactor(path, f, c);
     }
     public JComponent getFactorComponent(String path){
         return factorComponent.get(path);
     }
-    public void removeFactor(String path){
-        factors.remove(path);
-        factorComponent.remove(path);
+    public void removeFactor(String path, Factor f){
+        factors.remove(path + f.getName());
+        factorComponent.remove(path + f.getName());
         designPlan.setFactors(getFactors());
     }
=20


--===============8718211798227807000==--