From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:59 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2005 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/sensitivity	java/fr/ifremer/isisfish/ui/simulator
 resources/i18n
Date: Thu, 19 Mar 2009 11:49:26 +0100
Message-ID: <20090319104926.EAD9E461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1484034677120801874=="

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

Author: chatellier
Date: 2009-03-19 10:49:26 +0000 (Thu, 19 Mar 2009)
New Revision: 2005

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyChooserUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction=
.java
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Fix sensitivity chooser UI.

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-19 09:54:08 UTC (rev 2004)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityChooserUI.jaxx	2009-03-19 10:49:26 UTC (rev 2005)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,209 +18,261 @@
  *##%*/
=20
 /* *
- * IsisFish.java
+ * SensitivityChooserUI.
  *
- * Created: 1 aout 2005 18:37:25 CEST
+ * @author letellier
+ * @version $Revision$
  *
- * @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 $
+ * Last update: $Date$
+ * by : $Author$
  */
  -->
-
 <Table>
-<script><![CDATA[
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import jaxx.runtime.swing.Item;
-import fr.ifremer.isisfish.datastore.SensitivityStorage;
-import fr.ifremer.isisfish.ui.simulator.SimulAction;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
-import fr.ifremer.isisfish.simulator.sensitivity.Domain;
-import fr.ifremer.isisfish.simulator.sensitivity.Factor;
-import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
-import fr.ifremer.isisfish.export.SensitivityExport;
-import fr.ifremer.isisfish.IsisFishException;
+  <script><![CDATA[
+    import javax.swing.table.DefaultTableModel;
+    import javax.swing.table.TableModel;
+    import jaxx.runtime.swing.Item;
+    import fr.ifremer.isisfish.datastore.SensitivityStorage;
+    import fr.ifremer.isisfish.ui.simulator.SimulAction;
+    import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+    import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
+    import fr.ifremer.isisfish.simulator.sensitivity.Domain;
+    import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+    import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
+    import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+    import fr.ifremer.isisfish.export.SensitivityExport;
+    import fr.ifremer.isisfish.IsisFishException;
=20
-public ComboBoxModel getSensitivityModel(){
-    java.util.List<Item> items =3D new ArrayList<Item>();
-    items.add(new Item("null", " ", null, true));
-    for (String s : getSimulAction().getSensitivityName()){
-        items.add(new Item(s, s, s, false));
+    protected SimulAction getSimulAction() {
+        return getContextValue(SimulAction.class);
     }
-    fieldSensitivitySelect.setItems(items);
-    return fieldSensitivitySelect.getModel();
-}
-protected SimulAction getSimulAction(){
-    return getContextValue(SimulAction.class);
-}
-protected void sensChanged(){
-    if (fieldSensitivitySelect.getSelectedIndex() !=3D -1){
-        String sensitivityName =3D (String)fieldSensitivitySelect.getSelecte=
dItem();
-        getSimulAction().setSensitivity(sensitivityName);
-       =20
-        // enable/disable table
-        try {
-            SensitivityCalculator sens =3D SensitivityStorage.getSensitivity=
(sensitivityName).getNewSensitivityInstance();
-            factorCardinality.setVisible(!sens.canManageCardinality());
+
+    public ComboBoxModel getSensitivityCalculatorModel() {
+        java.util.List<Item> items =3D new ArrayList<Item>();
+        items.add(new Item("null", " ", null, true));
+        for (String s : getSimulAction().getSensitivityNames()) {
+            items.add(new Item(s, s, s, false));
         }
-        catch(IsisFishException e) {
-            // FIXME add log
+        fieldSensitivityCalculatorSelect.setItems(items);
+        return fieldSensitivityCalculatorSelect.getModel();
+    }
+
+    protected void sensCalculatorChanged() {
+        if (fieldSensitivityCalculatorSelect.getSelectedIndex() !=3D -1) {
+            String sensitivityName =3D (String)fieldSensitivityCalculatorSel=
ect.getSelectedItem();
+            getSimulAction().setSensitivity(sensitivityName);
+           =20
+            // enable/disable table
+            try {
+                SensitivityCalculator sens =3D SensitivityStorage.getSensiti=
vity(sensitivityName).getNewSensitivityInstance();
+                factorCardinality.setVisible(!sens.canManageCardinality());
+            }
+            catch(IsisFishException e) {
+                if (log.isErrorEnabled()) {
+                    log.error("Can't get canManageCardinality() value", e);
+                }
+            }
+            setSensitivityCalculatorParamsModel();
         }
-        setTableModel();
     }
-}
-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(){
+
+    protected void setSensitivityCalculatorParamsModel() {
+        Map<String, Class<?>> values =3D getSimulAction().getSensitivityPara=
meterNames((String)fieldSensitivityCalculatorSelect.getSelectedItem());
+        setSensitivityCalculatorParamsTableModel(values, simulSensitivityCal=
culatorParam);
+        simulSensitivityCalculatorParam.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).setSensitivityCalculatorP=
arameterValue(data.getName(), model.getValueAt(row, 1));
+            }
+        });
+    }
+
+    protected void setSensitivityCalculatorParamsTableModel(Map<String, Clas=
s<?>> values, JTable table) {
+        int row =3D 0;
+        if (values !=3D null){
+            DefaultTableModel model =3D new DefaultTableModel() {
                 @Override
                 public boolean isCellEditable(int row, int column) {
                     boolean result =3D false;
-                    if (column > 0){
-                        result =3Dtrue;
+                    if (column > 0) {
+                        result =3D true;
                     }
                     return result;
                 }
             };
-    java.util.List<Factor<? extends Serializable>> factors =3D getSimulActio=
n().getFactors();
-
-    java.util.List<Factor<? extends Serializable>> factorsContinue =3D new A=
rrayList<Factor<? extends Serializable>>();
-    java.util.List<String> incs =3D new ArrayList<String>();
-    for (Factor f : factors){
-        Domain domain =3D f.getDomain();
-        if (ContinuousDomain.class.isInstance(domain)){
-            ContinuousDomain continuousDomain =3D (ContinuousDomain)domain;
-            factorsContinue.add(f);
-            incs.add(continuousDomain.getCardinality() + "");
+            java.util.List<GenericCell> paramNamesList =3D new ArrayList<Gen=
ericCell>();
+            java.util.List<Object> paramValuesList =3D new ArrayList<Object>=
();
+            for (Iterator<String> it =3D values.keySet().iterator(); it.hasN=
ext();) {
+                String name =3D it.next();
+                Object properties =3D getContextValue(SimulAction.class).get=
SensitivityCalculatorParameterValue(name);
+                GenericCell value =3D new GenericCell(name, values.get(name)=
, null);
+                paramNamesList.add(value);
+                paramValuesList.add(properties);
+                row++;
+            }
+            model.addColumn(_("isisfish.common.name"), paramNamesList.toArra=
y());
+            model.addColumn(_("isisfish.common.value"), paramValuesList.toAr=
ray());
+            table.setModel(model);
+            ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
+            cellEditor.setRegion(getContextValue(SimulAction.class).getRegio=
nStorage());
+            table.getColumnModel().getColumn(1).setCellEditor(cellEditor);
         }
     }
-    model.addColumn("Factor", factorsContinue.toArray());
-    model.addColumn("Cardinality", incs.toArray());
=20
-    factorCardinality.setModel(model);
-    factorCardinality.getModel().addTableModelListener(new TableModelListene=
r() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            int row =3D e.getFirstRow();
-            TableModel model =3D (TableModel)e.getSource();
-            Factor f =3D (Factor) model.getValueAt(row, 0);
-            ((ContinuousDomain)f.getDomain()).setCardinality(Integer.parseIn=
t((String)model.getValueAt(row, 1)));
+    public void setFactorCardinalityTableModel() {
+        DefaultTableModel model =3D new DefaultTableModel() {
+            @Override
+            public boolean isCellEditable(int row, int column) {
+                boolean result =3D false;
+                if (column > 0) {
+                    result =3D true;
+                }
+                return result;
+            }
+        };
+        java.util.List<Factor<? extends Serializable>> factors =3D getSimulA=
ction().getFactors();
+
+    	java.util.List<Factor<? extends Serializable>> factorsContinue =3D new =
ArrayList<Factor<? extends Serializable>>();
+    	java.util.List<String> factorsContinueCardinalities =3D new ArrayList<S=
tring>();
+        for (Factor f : factors){
+            Domain domain =3D f.getDomain();
+            if (ContinuousDomain.class.isInstance(domain)){
+                ContinuousDomain continuousDomain =3D (ContinuousDomain)doma=
in;
+                factorsContinue.add(f);
+                factorsContinueCardinalities.add(continuousDomain.getCardina=
lity() + "");
+            }
         }
-    });
-}
-protected DefaultComboBoxModel getExportModel(){
-    java.util.List<String> exports =3D getAction().getSensibilityExportNames=
();
-    DefaultComboBoxModel model =3D new DefaultComboBoxModel(exports.toArray(=
));
-    return model;
-}
-protected void exportListSelected(){
-    remove.setEnabled(exportList.getSelectedIndex() !=3D -1);
-    setExportParams();
-}
-protected void setExportParams(){
-    Map<String, Class<?>> values =3D getAction().getSensitivityExportParamet=
erNames(getSelectedExport());
-    setParamsTable(values, exportParams);
+        model.addColumn(_("isisfish.factor.factor"), factorsContinue.toArray=
());
+        model.addColumn(_("isisfish.factor.increment"), factorsContinueCardi=
nalities.toArray());
=20
-    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;
-    if (values !=3D null){
-         DefaultTableModel model =3D new DefaultTableModel(){
+        factorCardinality.setModel(model);
+        factorCardinality.getModel().addTableModelListener(new TableModelLis=
tener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                int row =3D e.getFirstRow();
+                TableModel model =3D (TableModel)e.getSource();
+                Factor f =3D (Factor) model.getValueAt(row, 0);
+                ((ContinuousDomain)f.getDomain()).setCardinality(Integer.par=
seInt((String)model.getValueAt(row, 1)));
+            }
+        });
+    }
+
+    protected DefaultComboBoxModel getExportTableModel() {
+        java.util.List<String> exportNames =3D getSimulAction().getSensibili=
tyExportNames();
+        DefaultComboBoxModel model =3D new DefaultComboBoxModel(exportNames.=
toArray());
+        return model;
+    }
+
+    // FIXME use bindings ?
+    protected void exportListSelected() {
+        removeExportButton.setEnabled(exportList.getSelectedIndex() !=3D -1);
+        setExportParams();
+    }
+
+    /**
+     * Fill export parameters names and values in table.
+     */=20
+    protected void setExportParams() {
+        Map<String, Class<?>> values =3D getSimulAction().getSensitivityExpo=
rtParameterNames(getSelectedExport());
+        setSensitivityExportParamsTableModel(values, exportParamsTable);
+   =20
+        exportParamsTable.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).setSensitivityExportParam=
eterValue(getSelectedExport(), (String)data.getName(), model.getValueAt(row, =
1));
+            }
+        });
+    }
+   =20
+    /**
+     * FIXME can't be factorized with {link #setFactorCardinalityTableModel}
+     */
+    protected void setSensitivityExportParamsTableModel(Map<String, Class<?>=
> values, JTable table) {
+        int row =3D 0;
+        if (values !=3D null){
+            DefaultTableModel model =3D new DefaultTableModel() {
                 @Override
                 public boolean isCellEditable(int row, int column) {
                     boolean result =3D false;
-                    if (column > 0){
-                        result =3Dtrue;
+                    if (column > 0) {
+                        result =3D true;
                     }
                     return result;
                 }
             };
-         java.util.List<GenericCell> valuesList =3D new ArrayList<GenericCel=
l>();
-        java.util.List<Object> propertyList =3D new ArrayList<Object>();
-        for (Iterator<String> it =3D values.keySet().iterator(); it.hasNext(=
);) {
-            String name =3D it.next();
-            Object properties =3D getContextValue(SimulAction.class).getSens=
itivityParameterValue(name);
-            GenericCell value =3D new GenericCell(name, values.get(name), nu=
ll);
-            valuesList.add(value);
-            propertyList.add(properties);
-            row++;
+            java.util.List<GenericCell> paramNamesList =3D new ArrayList<Gen=
ericCell>();
+            java.util.List<Object> paramValuesList =3D new ArrayList<Object>=
();
+            for (Iterator<String> it =3D values.keySet().iterator(); it.hasN=
ext();) {
+                String name =3D it.next();
+                Object properties =3D getContextValue(SimulAction.class).get=
SensitivityExportParameterValue(getSelectedExport(), name);
+                GenericCell value =3D new GenericCell(name, values.get(name)=
, null);
+                paramNamesList.add(value);
+                paramValuesList.add(properties);
+                row++;
+            }
+            model.addColumn(_("isisfish.common.name"), paramNamesList.toArra=
y());
+            model.addColumn(_("isisfish.common.value"), paramValuesList.toAr=
ray());
+            table.setModel(model);
+            ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
+            cellEditor.setRegion(getContextValue(SimulAction.class).getRegio=
nStorage());
+            table.getColumnModel().getColumn(1).setCellEditor(cellEditor);
         }
-         model.addColumn("Name", valuesList.toArray());
-         model.addColumn("Value", propertyList.toArray());
-         table.setModel(model);
-        ParameterColumnEditor cellEditor =3D new ParameterColumnEditor();
-        cellEditor.setRegion(getContextValue(SimulAction.class).getRegionSto=
rage());
-        table.getColumnModel().getColumn(1).setCellEditor(cellEditor);
-
     }
-}
-protected SensitivityExport getSelectedExport(){
-    return (SensitivityExport)((GenericCell)exportList.getSelectedValue()).g=
etValue();
-}
-protected void add(){
-    getAction().addSensitivityExport((String)export.getSelectedItem());
-    setExportListModel();
-    clear.setEnabled(true);
-}
-protected void remove(){
-    getAction().removeSensitivityExport(getSelectedExport());
-    setExportListModel();
-    remove.setEnabled(false);
-}
-protected void clear(){
-    getAction().clearSensitivityExport();
-    setExportListModel();
-    clear.setEnabled(false);
-}
-protected void setExportListModel(){
-    DefaultListModel model =3D new DefaultListModel();
-    for (SensitivityExport s : getAction().getSensibilityExports()){
-        model.addElement(new GenericCell(s.getExportFilename(), s, s.getClas=
s()));
+   =20
+    protected SensitivityExport getSelectedExport(){
+        return (SensitivityExport)((GenericCell)exportList.getSelectedValue(=
)).getValue();
     }
-    exportList.setModel(model);
-}
-protected SimulAction getAction(){
-    return getContextValue(SimulAction.class);
-}
+   =20
+    /**
+     * Add an export.
+     *
+     * Export name can be duplicated.
+     */
+    protected void addExport() {
+        getSimulAction().addSensitivityExport((String)exportCombo.getSelecte=
dItem());
+        setExportListModel();
+        clearExportsButton.setEnabled(true);
+    }
+   =20
+    protected void removeExport() {
+        getSimulAction().removeSensitivityExport(getSelectedExport());
+        setExportListModel();
+        removeExportButton.setEnabled(false);
+    }
+   =20
+    protected void clearExports() {
+        getSimulAction().clearSensitivityExport();
+        setExportListModel();
+        clearExportsButton.setEnabled(false);
+    }
+   =20
+    protected void setExportListModel() {
+        DefaultListModel model =3D new DefaultListModel();
+        for (SensitivityExport s : getSimulAction().getSensibilityExports()){
+            model.addElement(new GenericCell(s.getExportFilename(), s, s.get=
Class()));
+        }
+        exportList.setModel(model);
+    }
     ]]>
-    </script>
+  </script>
     <row>
         <cell fill=3D"horizontal">
             <JLabel text=3D"isisfish.sensitivity.select"/>
         </cell>
         <cell fill=3D"horizontal" weightx=3D"1.0">
-            <JComboBox id=3D"fieldSensitivitySelect" model=3D'{getSensitivit=
yModel()}' onActionPerformed=3D'sensChanged()'/>
+            <JComboBox id=3D"fieldSensitivityCalculatorSelect" model=3D'{get=
SensitivityCalculatorModel()}' onActionPerformed=3D'sensCalculatorChanged()'/>
         </cell>
     </row>
     <row>
         <cell columns=3D"2" fill=3D"both" weightx=3D"1.0" weighty=3D"0.1">
             <JScrollPane>
-                <JTable id=3D"simulSensitivityParam" rowHeight=3D'24'/>
+                <JTable id=3D"simulSensitivityCalculatorParam" rowHeight=3D'=
24'/>
             </JScrollPane>
         </cell>
     </row>
@@ -245,11 +296,11 @@
                             </row>
                             <row>
                                 <cell fill=3D"horizontal">
-                                    <JComboBox id=3D"export"  model=3D'{getE=
xportModel()}'/>
+                                    <JComboBox id=3D"exportCombo" model=3D'{=
getExportTableModel()}'/>
                                 </cell>
                             </row>
                             <row>
-                                <cell fill=3D"both"  weightx=3D"1.0" weighty=
=3D"1.0">
+                                <cell fill=3D"both" weightx=3D"1.0" weighty=
=3D"1.0">
                                     <JScrollPane  minimumSize=3D'{new Dimens=
ion(0,0)}' preferredSize=3D'{new Dimension(0,0)}'>
                                         <JList id=3D"exportList" selectionMo=
de=3D"0" onMouseClicked=3D'exportListSelected()'/>
                                     </JScrollPane>
@@ -266,17 +317,17 @@
                             </row>
                             <row>
                                 <cell fill=3D'horizontal'>
-                                    <JButton id=3D"add" text=3D"isisfish.com=
mon.add" onActionPerformed=3D'add()'/>
+                                    <JButton id=3D"addExportButton" text=3D"=
isisfish.common.add" onActionPerformed=3D'addExport()'/>
                                 </cell>
                             </row>
                             <row>
                                 <cell fill=3D'horizontal'>
-                                    <JButton id=3D"remove" text=3D"isisfish.=
common.remove" enabled=3D"false" onActionPerformed=3D'remove()'/>
+                                    <JButton id=3D"removeExportButton" text=
=3D"isisfish.common.remove" enabled=3D"false" onActionPerformed=3D'removeExpo=
rt()'/>
                                 </cell>
                             </row>
                             <row>
                                 <cell fill=3D'horizontal'>
-                                    <JButton id=3D"clear" text=3D"isisfish.c=
ommon.clear" enabled=3D"false" onActionPerformed=3D'clear()'/>
+                                    <JButton id=3D"clearExportsButton" text=
=3D"isisfish.common.clear" enabled=3D"false" onActionPerformed=3D'clearExport=
s()'/>
                                 </cell>
                             </row>
                             <row>
@@ -293,7 +344,7 @@
      <row>
          <cell fill=3D"both" columns=3D'2' weightx=3D"1" weighty=3D"0.3">
             <JScrollPane  minimumSize=3D'{new Dimension(0,0)}' preferredSize=
=3D'{new Dimension(0,0)}'>
-                <JTable id=3D"exportParams" rowHeight=3D'24'/>
+                <JTable id=3D"exportParamsTable" rowHeight=3D'24'/>
             </JScrollPane>
          </cell>
      </row>


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sen=
sitivity/SensitivityChooserUI.jaxx
___________________________________________________________________
Name: svn:keywords
   + Revision Date Author

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityTabUI.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=
ityTabUI.jaxx	2009-03-19 09:54:08 UTC (rev 2004)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityTabUI.jaxx	2009-03-19 10:49:26 UTC (rev 2005)
@@ -152,7 +152,7 @@
     FactorTreeModel model =3D new FactorTreeModel(root);
     factors.setModel(model);
     factors.setCellRenderer(new FactorTreeCellRenderer());
-    getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFac=
torCardinalityModel();
+    getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFac=
torCardinalityTableModel();
 }
     ]]>
     </script>

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-19 09:54:08 UTC (rev 2004)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2009-03-19 10:49:26 UTC (rev 2005)
@@ -89,23 +89,26 @@
  * Created: 1 aout 2005 18:37:25 CEST
  *
  * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
+ * @version $Revision$
  *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
- * by : $Author: sletellier $
+ * Last update: $Date$
+ * by : $Author$
  */
 public class SimulAction {
=20
     /** to use log facility, just put in your code: log.info(\"...\"); */
     private static Log log =3D LogFactory.getLog(SimulAction.class);
+
+    private static final SimpleDateFormat DATEFORMAT =3D new SimpleDateForma=
t("yyyy-MM-dd-HH-mm");
+   =20
     protected SimulationParameter param =3D null;
     protected RegionStorage regionStorage =3D null;
     protected SimulationStorage simulStorage =3D null;
     protected RuleStorage ruleStorage =3D null;
     protected List<String> analysePlan =3D null;
     protected Map<Rule, String> rules =3D new HashMap<Rule, String>();
-    protected Map<String, SensitivityExport> sensibilityExports =3D new Hash=
Map<String, SensitivityExport>();
-    private static SimpleDateFormat dateFormat =3D new SimpleDateFormat("yyy=
y-MM-dd-HH-mm");
+    protected Map<SensitivityExport, String> sensibilityExports =3D new Hash=
Map<SensitivityExport, String>();
+   =20
     protected List<String> oldSimulNames =3D null;
     protected String simulName =3D null;
     protected SensitivityStorage sensitivityStorage =3D null;
@@ -113,19 +116,22 @@
     protected Map<String, JComponent> factorComponent =3D new HashMap<String=
, JComponent>();
     protected DesignPlan designPlan =3D new DesignPlan();
     protected SensitivityCalculator sensitivityCalculator =3D null;
-/*
- ************
- * Init
- ************
- */
-   =20
+
+    /*
+     ************
+     * Init
+     ************
+     */
+
     public SimulAction() {
         init();
     }
-    protected void showMsgBox(Exception eee){
+
+    protected void showMsgBox(Exception eee) {
         ErrorDialogUI.showError(eee);
     }
-    public void init(){
+
+    public void init() {
         log.debug("Init ");
         try {
             param =3D new SimulationParameter();
@@ -133,56 +139,65 @@
             // put default value in param
             param.setSimulatorName(IsisFish.config.getSimulatorClassfile());
             param.setTagValue(IsisFish.config.getDefaultTagValueAsMap());
-            param.setExportDirectory(IsisFish.config.getDefaultExportDirecto=
ry().toString());
+            param.setExportDirectory(IsisFish.config
+                    .getDefaultExportDirectory().toString());
             param.setExportNames(IsisFish.config.getDefaultExportNamesAsList=
());
             analysePlan =3D AnalysePlanStorage.getAnalysePlanNames();
-            List<String> defaultResultNames =3D IsisFish.config.getDefaultRe=
sultNamesAsList();
+            List<String> defaultResultNames =3D IsisFish.config
+                    .getDefaultResultNamesAsList();
             if (defaultResultNames !=3D null) {
                 param.setResultEnabled(defaultResultNames);
             } else {
                 param.setResultEnabled(resultNames);
             }
-        }
-        catch (Exception eee) {
+        } catch (Exception eee) {
             log.error("Can't init SimulationParameter", eee);
             showMsgBox(eee);
         }
     }
-    protected void setName(String name){
+
+    protected void setName(String name) {
         simulName =3D name;
     }
-    protected void importSimulation(File f){
+
+    protected void importSimulation(File f) {
         FileInputStream fos =3D null;
         try {
             fos =3D new FileInputStream(f);
             Properties proper =3D new Properties();
             proper.load(fos);
-            param.fromProperties(SimulationStorage.getSimulationDirectory(),=
 proper);
+            param.fromProperties(SimulationStorage.getSimulationDirectory(),
+                    proper);
         } catch (Exception ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         } finally {
             try {
                 fos.close();
             } catch (IOException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
     }
-    protected void saveSimulation(File f){
+
+    protected void saveSimulation(File f) {
         FileOutputStream fos =3D null;
         try {
             fos =3D new FileOutputStream(f);
             param.copy().toProperties().store(fos, simulName);
         } catch (Exception ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         } finally {
             try {
                 fos.close();
             } catch (IOException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
@@ -215,7 +230,8 @@
=20
     protected void stopSimulation(SimulationJob job) {
         job.stop();
-        log.info(_("User stop simulation %s", job.getItem().getControl().get=
Id()));
+        log.info(_("User stop simulation %s", job.getItem().getControl()
+                .getId()));
     }
=20
     protected void viewLog(SimulationJob job) {
@@ -232,21 +248,20 @@
         SimulationService ss =3D SimulationService.getService();
         ss.clearJobDone();
     }
-   =20
+
     /**
      * Change region in simulation launcher
      *
       * @param regionName SimulationParameter/description
      */
     public void regionChange(String regionName) {
-        try{
+        try {
             regionStorage =3D RegionStorage.getRegion(regionName);
             param.setRegionName(regionName);
             for (Rule r : param.getRules()) {
                 rules.put(r, RuleStorage.getName(r));
             }
-        }
-        catch (Exception eee){
+        } catch (Exception eee) {
             showMsgBox(eee);
         }
     }
@@ -270,15 +285,14 @@
             showMsgBox(eee);
         }
     }
-   =20
-/*
- ************
- * ParamsUI
- ************
- */
-   =20
-// Gestion des rules
-   =20
+
+    /*
+     ************
+     * ParamsUI
+     ************
+     */
+
+    // Gestion des rules
     public void addRules(String name) {
         ruleStorage =3D RuleStorage.getRule(name);
         try {
@@ -286,10 +300,12 @@
             rules.put(ruleTmp, name);
             param.addRule(ruleTmp);
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
     }
+
     public List<String> getRuleNames() {
         List<String> result =3D new ArrayList<String>();
         for (String r : RuleStorage.getRuleNames()) {
@@ -297,18 +313,21 @@
         }
         return result;
     }
+
     public List<String> getRules() {
         List<String> result =3D new ArrayList<String>();
         for (Rule r : param.getRules()) {
             try {
                 result.add(RuleStorage.getName(r));
             } catch (Exception ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
         return result;
     }
+
     public void removeRules(String name) {
         if (name !=3D null) {
             for (Map.Entry<Rule, String> entry : rules.entrySet()) {
@@ -319,7 +338,8 @@
             }
         }
     }
-    public Rule getRule(String ruleName){
+
+    public Rule getRule(String ruleName) {
         Rule r =3D null;
         for (Map.Entry<Rule, String> entry : rules.entrySet()) {
             if (entry.getValue().equals(ruleName)) {
@@ -328,41 +348,48 @@
         }
         return r;
     }
+
     public Map<String, Class> getRuleParameterName(String ruleName) {
         Map<String, Class> result =3D null;
         if (ruleName !=3D null) {
             Rule r =3D getRule(ruleName);
-            if (r !=3D null){
+            if (r !=3D null) {
                 result =3D RuleStorage.getParameterNames(r);
             }
         }
         return result;
     }
-    public Object getRuleParameterValue(String paramName, String ruleName){
+
+    public Object getRuleParameterValue(String paramName, String ruleName) {
         Object result =3D null;
         if (ruleName !=3D null) {
             try {
-                result =3D RuleStorage.getParameterValue(getRule(ruleName), =
paramName);
+                result =3D RuleStorage.getParameterValue(getRule(ruleName),
+                        paramName);
             } catch (IsisFishException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
         return result;
     }
-    public void setRuleParameterValue(String paramName, String ruleName, Obj=
ect o){
+
+    public void setRuleParameterValue(String paramName, String ruleName,
+            Object o) {
         if (ruleName !=3D null) {
             try {
                 RuleStorage.setParameterValue(getRule(ruleName), paramName, =
o);
             } catch (IsisFishException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
     }
-   =20
-// Strategies
=20
+    // Strategies
+
     public List<Strategy> getStrategies() {
         List<Strategy> result =3D new ArrayList<Strategy>();
         try {
@@ -371,7 +398,8 @@
             tx.rollbackTransaction();
             tx.closeContext();
         } catch (Exception ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
         return result;
@@ -384,34 +412,37 @@
         }
         param.setStrategies(result);
     }
-   =20
-// Population
-   =20
+
+    // Population
+
     public List<Population> getPopulations() {
-       =20
+
         List<Population> result =3D new ArrayList<Population>();
         try {
             TopiaContext tx =3D param.getRegion().getStorage().beginTransact=
ion();
-            List<Species> species =3D RegionStorage.getFisheryRegion(tx).get=
Species();
+            List<Species> species =3D RegionStorage.getFisheryRegion(tx)
+                    .getSpecies();
             for (Species s : species) {
                 Collection<Population> populations =3D s.getPopulation();
-               =20
+
                 // FIXME initialiaze lazy hibernate collection
-                for(Population p : populations) {
+                for (Population p : populations) {
                     p.getPopulationGroup().size();
                     p.getPopulationZone().size();
                 }
-               =20
+
                 result.addAll(populations);
             }
             tx.rollbackTransaction();
             tx.closeContext();
         } catch (Exception ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
         return result;
     }
+
     public void setPopulations(Object[] populations) {
         List<Population> result =3D new ArrayList<Population>();
         for (Object o : populations) {
@@ -420,8 +451,8 @@
         param.setPopulations(result);
     }
=20
-// Years
-   =20
+    // Years
+
     public void setNbAnnees(String years) {
         param.setNumberOfYear(Integer.parseInt(years));
     }
@@ -429,7 +460,7 @@
     public List<String> getSimulatorNames() {
         return SimulatorStorage.getSimulatorNames();
     }
-   =20
+
     /*
      * Return old simulations
      *
@@ -439,7 +470,7 @@
      * @deprecated use fr.ifremer.isisfish.ui.Common.getOldSimulationItem()
      */
     public List<String> getOldSimulationItem() {
-       =20
+
         try {
             oldSimulNames =3D new ArrayList<String>();
=20
@@ -451,7 +482,7 @@
             // to used directly model.getFilteredResult() in xml
             // we must fill filterModel result with original items
             filterModel.selectAll();
-           =20
+
             // chatellier : Ajout d'une entr=C3=A9e vide pour forcer la s=C3=
=A9lection
             // et que le changement lance un evenement sur la liste
             // Add empty item after, otherwise, un " " directory
@@ -460,40 +491,43 @@
=20
             return oldSimulNames;
         } catch (ParseException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         } catch (IOException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
         return null;
     }
+
     public List<String> getFilteredOldSimulatorNames() {
         return getFilteredOldSimulatorNames(false);
     }
+
     public List<String> getFilteredOldSimulatorNames(boolean force) {
-        if (oldSimulNames =3D=3D null || force){
+        if (oldSimulNames =3D=3D null || force) {
             oldSimulNames =3D getOldSimulationItem();
         }
         return oldSimulNames;
     }
=20
-    public void setOldSimulatorNames(List<String> sn){
+    public void setOldSimulatorNames(List<String> sn) {
         oldSimulNames =3D sn;
     }
-    public void resetOldSimulatorNames(){
+
+    public void resetOldSimulatorNames() {
         oldSimulNames =3D getOldSimulationItem();
     }
-   =20
-   =20
-/*
- ************
- * AdvancedParameterUI
- ************
- */=20
=20
+    /*
+     ************
+     * AdvancedParameterUI
+     ************
+     */
+
     // Gestion des TagValues
-
     public void addTagValue(String tag, String value) {
         param.getTagValue().put(tag, value);
     }
@@ -510,14 +544,15 @@
=20
         IsisFish.config.setSimulatorClassfile(simulatorName);
     }
-/*
- * ExportUI
- */
-   =20
+
+    /*
+     * ExportUI
+     */
+
     public List<String> getExportNames() {
         List<String> result =3D new ArrayList<String>();
         List<String> exportNames =3D ExportStorage.getExportNames();
-        for (String export : exportNames){
+        for (String export : exportNames) {
             try {
                 ExportStorage storage =3D ExportStorage.getExport(export);
                 Export exInstance =3D storage.getNewExportInstance();
@@ -525,7 +560,8 @@
                     result.add(export);
                 }
             } catch (IsisFishException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
             }
         }
         return result;
@@ -537,15 +573,15 @@
=20
     public void saveExport() {
         IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()=
);
-        if (param.getExportNames() !=3D null){
+        if (param.getExportNames() !=3D null) {
             IsisFish.config.setDefaultExportNames(param.getExportNames());
         }
     }
-   =20
-/*
- * ResultUI
- */
=20
+    /*
+     * ResultUI
+     */
+
     public void saveResultNames(Object[] resultNames) {
         List<String> resultNamesString =3D new ArrayList<String>();
         for (Object o : resultNames) {
@@ -554,81 +590,89 @@
         param.setResultEnabled(resultNamesString);
         IsisFish.config.setDefaultResultNames(resultNamesString);
     }
-   =20
-    public List<String> getDefaultResultNames(){
+
+    public List<String> getDefaultResultNames() {
         return IsisFish.config.getDefaultResultNamesAsList();
     }
-   =20
-/**
- ************
- *  SensUI
- ************
- */
-   =20
-// Gestion des analysePlans
-   =20
-    public List<String> getAnalysePlanNames(){
+
+    /*
+     *  SensUI
+     */
+
+    // Gestion des analysePlans
+    public List<String> getAnalysePlanNames() {
         return analysePlan;
     }
-    public List<AnalysePlan> getParamAnalysePlans(){
+
+    public List<AnalysePlan> getParamAnalysePlans() {
         return param.getAnalysePlans();
     }
-    public void addAnalysePlan(String name){
+
+    public void addAnalysePlan(String name) {
         try {
-            AnalysePlan ap =3D AnalysePlanStorage.getAnalysePlan(name).getNe=
wAnalysePlanInstance();
+            AnalysePlan ap =3D AnalysePlanStorage.getAnalysePlan(name)
+                    .getNewAnalysePlanInstance();
             getSimulationParameter().addAnalysePlan(ap);
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
     }
-    public void removeAnalysePlan(AnalysePlan ap){
-         getSimulationParameter().removeAnalysePlan(ap);
+
+    public void removeAnalysePlan(AnalysePlan ap) {
+        getSimulationParameter().removeAnalysePlan(ap);
     }
-     public void clearAnalysePlan(){
-         getSimulationParameter().clearPlans();
+
+    public void clearAnalysePlan() {
+        getSimulationParameter().clearPlans();
     }
+
     public Map<String, Class> getAnalysePlanParameterName(AnalysePlan ap) {
         Map<String, Class> result =3D null;
         if (ap !=3D null) {
-           result =3D AnalysePlanStorage.getParameterNames(ap);
+            result =3D AnalysePlanStorage.getParameterNames(ap);
         }
         return result;
     }
-    public Object getAnalysePlanParameterValue(String paramName, AnalysePlan=
 ap){
+
+    public Object getAnalysePlanParameterValue(String paramName, AnalysePlan=
 ap) {
         Object result =3D null;
         if (ap !=3D null) {
             try {
                 result =3D AnalysePlanStorage.getParameterValue(ap, paramNam=
e);
             } catch (IsisFishException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
                 showMsgBox(ex);
             }
         }
         return result;
     }
-    public void setAnalysePlanParameterValue(String paramName, AnalysePlan a=
p, Object value){
-        if (log.isDebugEnabled()){
-            log.debug("paramName : " + paramName + " analysePlanName : " + a=
p + " value : " + value);
+
+    public void setAnalysePlanParameterValue(String paramName, AnalysePlan a=
p,
+            Object value) {
+        if (log.isDebugEnabled()) {
+            log.debug("paramName : " + paramName + " analysePlanName : " + ap
+                    + " value : " + value);
         }
         try {
             AnalysePlanStorage.setParameterValue(ap, paramName, value);
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
     }
=20
-/*
- ************
- * Sensitivity
- ************
- */
+    /*
+     * Sensitivity
+     */
=20
     public List<String> getSensibilityExportNames() {
         List<String> result =3D new ArrayList<String>();
         List<String> exportNames =3D ExportStorage.getExportNames();
-        for (String export : exportNames){
+        for (String export : exportNames) {
             try {
                 ExportStorage storage =3D ExportStorage.getExport(export);
                 Export exInstance =3D storage.getNewExportInstance();
@@ -636,121 +680,168 @@
                     result.add(export);
                 }
             } catch (IsisFishException ex) {
-                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE, null, ex);
+                Logger.getLogger(SimulAction.class.getName()).log(Level.SEVE=
RE,
+                        null, ex);
             }
         }
         return result;
     }
-    public Collection<SensitivityExport> getSensibilityExports(){
-        return sensibilityExports.values();
+
+    public Collection<SensitivityExport> getSensibilityExports() {
+        return sensibilityExports.keySet();
     }
-    public List<SensitivityExport> getSensitivityExportList(){
+
+    public List<SensitivityExport> getSensitivityExportList() {
         List<SensitivityExport> result =3D new ArrayList<SensitivityExport>(=
);
-        for (Map.Entry<String, SensitivityExport> entry : sensibilityExports=
.entrySet()) {
-            result.add(entry.getValue());
+        for (Map.Entry<SensitivityExport, String> entry : sensibilityExports
+                .entrySet()) {
+            result.add(entry.getKey());
         }
         return result;
     }
-    public void addSensitivityExport(String name){
+
+    public void addSensitivityExport(String name) {
         try {
             ExportStorage storage =3D ExportStorage.getExport(name);
-            SensitivityExport exInstance =3D (SensitivityExport) storage.get=
NewExportInstance();
-            sensibilityExports.put(name, exInstance);
+            SensitivityExport exInstance =3D (SensitivityExport) storage
+                    .getNewExportInstance();
+            sensibilityExports.put(exInstance, name);
             param.setSensitivityExport(getSensitivityExportList());
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
         }
     }
-    public void removeSensitivityExport(SensitivityExport export){
-        Map<String, SensitivityExport> se =3D new HashMap<String, Sensitivit=
yExport>();
-        for (Map.Entry<String, SensitivityExport> entry : sensibilityExports=
.entrySet()) {
-            if (!entry.getValue().equals(export)){
+
+    public void removeSensitivityExport(SensitivityExport export) {
+        Map<SensitivityExport, String> se =3D new HashMap<SensitivityExport,=
 String>();
+        for (Map.Entry<SensitivityExport, String> entry : sensibilityExports
+                .entrySet()) {
+            if (!entry.getValue().equals(export)) {
                 se.put(entry.getKey(), entry.getValue());
             }
         }
         sensibilityExports =3D se;
         param.setSensitivityExport(getSensitivityExportList());
     }
-    public void clearSensitivityExport(){
+
+    public void clearSensitivityExport() {
         sensibilityExports.clear();
         param.setSensitivityExport(getSensitivityExportList());
     }
-    public Map<String, Class<?>> getSensitivityExportParameterNames(Sensitiv=
ityExport export){
+
+    public Map<String, Class<?>> getSensitivityExportParameterNames(
+            SensitivityExport export) {
         return ExportStorage.getParameterNames(export);
     }
-    public void setSensitivityExportParameterNames(Export export, String par=
amName, Object value){
-        if (value !=3D null){
+
+    public void setSensitivityExportParameterValue(Export export,
+            String paramName, 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);
+            } catch (IsisFishException e) {
+                if (log.isErrorEnabled()) {
+                    log.error("Can't set sensitivity export param value", e);
+                }
             }
         }
     }
-    public List<String> getSensitivityName(){
+
+    public Object getSensitivityExportParameterValue(Export export, String p=
aramName) {
+        Object result =3D null;
+        try {
+            result =3D ExportStorage.getParameterValue(export, paramName);
+        } catch (IsisFishException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't get sensitivity export param value", e);
+            }
+        }
+        return result;
+    }
+   =20
+    public List<String> getSensitivityNames() {
         return SensitivityStorage.getSensitivityNames();
     }
-    public Map<String, Class<?>> getSensitivityParameterNames(String name){
+
+    public Map<String, Class<?>> getSensitivityParameterNames(String name) {
         Map<String, Class<?>> result =3D null;
         try {
             SensitivityStorage sens =3D SensitivityStorage.getSensitivity(na=
me);
             result =3D sens.getParameterNames();
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
         }
         return result;
     }
-    public Object getSensitivityParameterValue(String paramName){
+
+    public Object getSensitivityCalculatorParameterValue(String paramName) {
         Object result =3D null;
         try {
-            result =3D SensitivityStorage.getParameterValue(param.getSensiti=
vityCalculator(), paramName);
+            result =3D SensitivityStorage.getParameterValue(param
+                    .getSensitivityCalculator(), paramName);
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
         return result;
     }
-    public void setSensitivityParameterValue(String paramName, Object value){
+
+    public void setSensitivityCalculatorParameterValue(String paramName,
+            Object value) {
         try {
-            if (value !=3D null){
-                SensitivityStorage.setParameterValue(param.getSensitivityCal=
culator(), paramName, value);
+            if (value !=3D null) {
+                SensitivityStorage.setParameterValue(param
+                        .getSensitivityCalculator(), paramName, value);
             }
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
             showMsgBox(ex);
         }
     }
-    public SensitivityStorage getSensitivity(String name){
+
+    public SensitivityStorage getSensitivity(String name) {
         return SensitivityStorage.getSensitivity(name);
     }
-    public void setSensitivity(String name){
+
+    public void setSensitivity(String name) {
         try {
             sensitivityStorage =3D SensitivityStorage.getSensitivity(name);
-            SensitivityCalculator sensCal =3D sensitivityStorage.getNewSensi=
tivityInstance();
+            SensitivityCalculator sensCal =3D sensitivityStorage
+                    .getNewSensitivityInstance();
             sensitivityCalculator =3D sensCal;
             param.setSensitivityCalculator(sensitivityCalculator);
         } catch (IsisFishException ex) {
-            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
+            Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE,
+                    null, ex);
         }
     }
-    public List<Factor<? extends Serializable>> getFactors(){
+
+    public List<Factor<? extends Serializable>> getFactors() {
         List<Factor<? extends Serializable>> result =3D new ArrayList<Factor=
<? extends Serializable>>();
         for (Map.Entry entry : factors.entrySet()) {
-            result.add((Factor<? extends Serializable>)entry.getValue());
+            result.add((Factor<? extends Serializable>) entry.getValue());
         }
         return result;
     }
-    public void addFactor(String path, Factor f, JComponent c){
+
+    public void addFactor(String path, Factor f, JComponent c) {
         factors.put(path + f.getName(), f);
         factorComponent.put(path + f.getName(), c);
         designPlan.setFactors(getFactors());
     }
-    public Factor<? extends Serializable>  getFactor(String name){
+
+    public Factor<? extends Serializable> getFactor(String name) {
         return factors.get(name);
     }
-    public void addContinuousFactor(String name, String path, Serializable m=
in, Serializable max, JComponent c, boolean exist){
+
+    public void addContinuousFactor(String name, String path, Serializable m=
in,
+            Serializable max, JComponent c, boolean exist) {
         Factor f =3D new Factor(name);
-        ContinuousDomain<Serializable>  domain =3D new ContinuousDomain<Seri=
alizable>();
+        ContinuousDomain<Serializable> domain =3D new ContinuousDomain<Seria=
lizable>();
         domain.setMinBound(min);
         domain.setMaxBound(max);
         f.setDomain(domain);
@@ -759,11 +850,13 @@
             removeFactor(path, f);
         addFactor(path, f, c);
     }
-    public void addDiscreteFactor(String name, String path, List<Serializabl=
e> values, JComponent c, boolean exist){
+
+    public void addDiscreteFactor(String name, String path,
+            List<Serializable> values, JComponent c, boolean exist) {
         Factor f =3D new Factor(name);
         DiscreteDomain<Serializable> domain =3D new DiscreteDomain<Serializa=
ble>();
         int i =3D 0;
-        for (Serializable value : values){
+        for (Serializable value : values) {
             // FIXME test when integer
             // Don't work with String ;(
             domain.getValues().put(i, value);
@@ -776,7 +869,10 @@
             removeFactor(path, f);
         addFactor(path, f, c);
     }
-    public void addContinuousEquationFactor(String name, String path, Equati=
onContinuousDomain domain, String equation, JComponent c, boolean exist){
+
+    public void addContinuousEquationFactor(String name, String path,
+            EquationContinuousDomain domain, String equation, JComponent c,
+            boolean exist) {
         Factor f =3D new Factor(name);
         f.setValue(equation);
         f.setDomain(domain);
@@ -785,7 +881,10 @@
             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 addContinuousMatrixFactor(String name, String path,
+            Serializable min, Serializable max, MatrixND matrix,
+            String operateur, JComponent c, boolean exist) {
         Factor f =3D new Factor(name);
         MatrixContinuousDomain<Serializable> domain =3D new MatrixContinuous=
Domain<Serializable>();
         domain.setMatrix(matrix);
@@ -799,21 +898,23 @@
             removeFactor(path, f);
         addFactor(path, f, c);
     }
-    public JComponent getFactorComponent(String path){
+
+    public JComponent getFactorComponent(String path) {
         return factorComponent.get(path);
     }
-    public void removeFactor(String path, Factor f){
+
+    public void removeFactor(String path, Factor f) {
         factors.remove(path + f.getName());
         factorComponent.remove(path + f.getName());
         designPlan.setFactors(getFactors());
     }
=20
-/*
- ************
- * General
- ************
- */
-   =20
+    /*
+     ************
+     * General
+     ************
+     */
+
     public SimulationParameter getSimulationParameter() {
         return param;
     }
@@ -829,7 +930,7 @@
     public RegionStorage getRegionStorage() {
         return regionStorage;
     }
-   =20
+
     public List<SimulatorLauncher> getSimulationLauncher() {
         return SimulationService.getService().getSimulationLaunchers();
     }
@@ -844,23 +945,27 @@
      * @see SimulatorLauncher
      */
     public void launchSimulation(String simulationId, SimulatorLauncher laun=
cher) {
-       =20
-        String fullSimulationId =3D "sim_" + simulationId + "_" + dateFormat=
.format(new java.util.Date());
-       =20
+
+        String fullSimulationId =3D "sim_" + simulationId + "_"
+                + DATEFORMAT.format(new java.util.Date());
+
         // log
         if (log.isDebugEnabled()) {
-            log.debug("Launch simulation with custom launcher " + launcher.t=
oString());
+            log.debug("Launch simulation with custom launcher "
+                    + launcher.toString());
         }
-       =20
+
         try {
-            if ("".equals(fullSimulationId) ||
-                SimulationStorage.localyExists(fullSimulationId) ||
-                SimulationService.getService().exists(fullSimulationId)) {
-                UserLog.error(_("isisfish.simulator.simulaction.badid", full=
SimulationId));
+            if ("".equals(fullSimulationId)
+                    || SimulationStorage.localyExists(fullSimulationId)
+                    || SimulationService.getService().exists(fullSimulationI=
d)) {
+                UserLog.error(_("isisfish.simulator.simulaction.badid",
+                        fullSimulationId));
             } else {
                 SimulationParameter p =3D param.copy();
=20
-                SimulationService.getService().submit(fullSimulationId, p, l=
auncher, 0);
+                SimulationService.getService().submit(fullSimulationId, p,
+                        launcher, 0);
             }
         } catch (Exception eee) {
             if (log.isErrorEnabled()) {
@@ -882,26 +987,31 @@
      * @see SensitivityCalculator
      * @see DesignPlan
      */
-    public void launchSimulation(String simulationId, SimulatorLauncher laun=
cher,
+    public void launchSimulation(String simulationId,
+            SimulatorLauncher launcher,
             SensitivityCalculator sensitivityCalculator, DesignPlan designPl=
an) {
=20
-        String fullSimulationId =3D "as_" + simulationId + "_" + dateFormat.=
format(new java.util.Date());
+        String fullSimulationId =3D "as_" + simulationId + "_"
+                + DATEFORMAT.format(new java.util.Date());
=20
         // log
         if (log.isDebugEnabled()) {
-            log.debug("Launch factor simulation with custom launcher " + lau=
ncher.toString());
-            log.debug("Using sensitivityCalculator : " + sensitivityCalculat=
or.getDescription());
+            log.debug("Launch factor simulation with custom launcher "
+                    + launcher.toString());
+            log.debug("Using sensitivityCalculator : "
+                    + sensitivityCalculator.getDescription());
         }
=20
         try {
-            if ("".equals(fullSimulationId) ||
-                SimulationStorage.localyExists(fullSimulationId) ||
-                SimulationService.getService().exists(fullSimulationId)) {
-                UserLog.error(_("isisfish.simulator.simulaction.badid", full=
SimulationId));
+            if ("".equals(fullSimulationId)
+                    || SimulationStorage.localyExists(fullSimulationId)
+                    || SimulationService.getService().exists(fullSimulationI=
d)) {
+                UserLog.error(_("isisfish.simulator.simulaction.badid",
+                        fullSimulationId));
             } else {
                 SimulationParameter p =3D param.copy();
-                SimulationService.getService().submit(fullSimulationId, p, l=
auncher, 0,
-                        sensitivityCalculator, designPlan);
+                SimulationService.getService().submit(fullSimulationId, p,
+                        launcher, 0, sensitivityCalculator, designPlan);
             }
         } catch (Exception eee) {
             if (log.isErrorEnabled()) {
@@ -911,10 +1021,12 @@
         }
     }
=20
-    public void launchSimulationWhithSensibility(String simulationId, Simula=
torLauncher launcher) {
-        launchSimulation(simulationId, launcher, sensitivityCalculator, desi=
gnPlan);
+    public void launchSimulationWhithSensibility(String simulationId,
+            SimulatorLauncher launcher) {
+        launchSimulation(simulationId, launcher, sensitivityCalculator,
+                designPlan);
     }
-   =20
+
     /**
      * Lance la second passe d'une analyse de sensibilit=C3=A9.
      *=20
@@ -928,11 +1040,16 @@
         SortedMap<Integer, SimulationStorage> simulationStorageForAnalyze =
=3D new TreeMap<Integer, SimulationStorage>();
         File simuationDirectory =3D SimulationStorage.getSimulationDirectory=
();
         for (File simuation : simuationDirectory.listFiles()) {
-            if (simuation.isDirectory() && simuation.getName().startsWith(ma=
sterSensitivitySimulationName + "_")) {
-                SimulationStorage storage =3D SimulationStorage.getSimulatio=
n(simuation.getName());
-                String suffix =3D simuation.getName().substring(simuation.ge=
tName().lastIndexOf("_") + 1);
-                simulationStorageForAnalyze.put(Integer.valueOf(suffix), sto=
rage);
-               =20
+            if (simuation.isDirectory()
+                    && simuation.getName().startsWith(
+                            masterSensitivitySimulationName + "_")) {
+                SimulationStorage storage =3D SimulationStorage
+                        .getSimulation(simuation.getName());
+                String suffix =3D simuation.getName().substring(
+                        simuation.getName().lastIndexOf("_") + 1);
+                simulationStorageForAnalyze.put(Integer.valueOf(suffix),
+                        storage);
+
                 if (sensitivityCalculator =3D=3D null) {
                     // try to find find calculator name in one storage
                     SimulationParameter params =3D storage.getParameter();
@@ -944,21 +1061,22 @@
         if (sensitivityCalculator !=3D null) {
             try {
                 // build master sensitivity export directory
-                File masterExportDirectory =3D new File(IsisFish.config.getD=
efaultExportDirectory(), masterSensitivitySimulationName);
-                if( !masterExportDirectory.isDirectory()) {
+                File masterExportDirectory =3D new File(IsisFish.config
+                        .getDefaultExportDirectory(),
+                        masterSensitivitySimulationName);
+                if (!masterExportDirectory.isDirectory()) {
                     masterExportDirectory.mkdirs();
                 }
-                List<SimulationStorage> simulationStorageForAnalyzeList =3D
-                    new ArrayList<SimulationStorage>(simulationStorageForAna=
lyze.values());
-                sensitivityCalculator.analyzeResult(simulationStorageForAnal=
yzeList, masterExportDirectory);
-            }
-            catch(SensitivityException e) {
+                List<SimulationStorage> simulationStorageForAnalyzeList =3D =
new ArrayList<SimulationStorage>(
+                        simulationStorageForAnalyze.values());
+                sensitivityCalculator.analyzeResult(
+                        simulationStorageForAnalyzeList, masterExportDirecto=
ry);
+            } catch (SensitivityException e) {
                 if (log.isErrorEnabled()) {
                     log.error("Can't call analyse result", e);
                 }
             }
-        }
-        else {
+        } else {
             if (log.isWarnEnabled()) {
                 log.warn("Can't run sensitivity second pass");
             }
@@ -972,15 +1090,18 @@
      *=20
      * @return les fichiers genere lors de la seconde passe (seulement ceux =
qui ne commence pas par ".")
      */
-    public List<File> getSensitivitySecondPassResults(String masterSensitivi=
tySimulationName) {
+    public List<File> getSensitivitySecondPassResults(
+            String masterSensitivitySimulationName) {
=20
         List<File> result =3D new ArrayList<File>();
=20
         // build master sensitivity export directory
-        File masterExportDirectory =3D new File(IsisFish.config.getDefaultEx=
portDirectory(), masterSensitivitySimulationName);
-        if( masterExportDirectory.isDirectory()) {
-            for(File exportFile : masterExportDirectory.listFiles()) {
-                if (exportFile.isFile() && !exportFile.getName().startsWith(=
".")) {
+        File masterExportDirectory =3D new File(IsisFish.config
+                .getDefaultExportDirectory(), masterSensitivitySimulationNam=
e);
+        if (masterExportDirectory.isDirectory()) {
+            for (File exportFile : masterExportDirectory.listFiles()) {
+                if (exportFile.isFile()
+                        && !exportFile.getName().startsWith(".")) {
                     result.add(exportFile);
                 }
             }


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sim=
ulator/SimulAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Revision

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-19 09:54:08 UTC (rev 2004)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
3-19 10:49:26 UTC (rev 2005)
@@ -106,6 +106,7 @@
 isisfish.common.info=3Dinfo
 isisfish.common.migration=3Dmigration
 isisfish.common.month=3Dmonth %1$s
+isisfish.common.name=3DName
 isisfish.common.new=3Dnew
 isisfish.common.newMatrix=3Dnew Matrix
 isisfish.common.next=3Dnext
@@ -354,6 +355,7 @@
 isisfish.factor.comment=3DComment
 isisfish.factor.continue=3DContinue factor
 isisfish.factor.discret=3DDiscret factor
+isisfish.factor.factor=3DFactor
 isisfish.factor.firstValue=3DFirst value
 isisfish.factor.increment=3DCardinality
 isisfish.factor.lastValue=3DLast value

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-19 09:54:08 UTC (rev 2004)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
3-19 10:49:26 UTC (rev 2005)
@@ -106,6 +106,7 @@
 isisfish.common.info=3DInfo
 isisfish.common.migration=3Dmigration
 isisfish.common.month=3Dmois %1$s
+isisfish.common.name=3DNom
 isisfish.common.new=3DNouveau
 isisfish.common.newMatrix=3DNouvelle matrice
 isisfish.common.next=3DSuivant
@@ -354,6 +355,7 @@
 isisfish.factor.comment=3DCommentaires
 isisfish.factor.continue=3DFacteur continu
 isisfish.factor.discret=3DFacteur discret
+isisfish.factor.factor=3DFacteur
 isisfish.factor.firstValue=3DPremi\u00E8re valeur
 isisfish.factor.increment=3DCardinalit\u00E9
 isisfish.factor.lastValue=3DDerni\u00E8re valeur


--===============1484034677120801874==--