r1949 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator resources/i18n resources/icons - Isis-fish-commits

12 Mar 2009

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

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
   isis-fish/trunk/src/main/resources/icons/building.png
   isis-fish/trunk/src/main/resources/icons/building_add.png
Log:
Adding color glassPane, factor rangeOfValue, debug....

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================

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

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

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

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -0,0 +1,57 @@
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/>
+
+     <script><![CDATA[
+import fr.ifremer.isisfish.types.RangeOfValues;
+import fr.ifremer.isisfish.entities.Gear;
+import fr.ifremer.isisfish.entities.GearImpl;
+
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (evt.getOldValue() != null || evt.getNewValue() == null) {
+            // remove previous binding on getBean()
+            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+            fieldGearParamPossibleValue.setText("");
+        }
+        if (evt.getNewValue() != null) {
+            // add binding on getBean()
+            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+        }
+    }
+});
+
+boolean init = false;
+public void refresh(){
+    Gear gear = getVerifier().getEntity(Gear.class);
+    setBean((GearImpl) gear);
+    java.util.List<Object> values = new ArrayList<Object>();
+    for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())
+        values.add(value);
+    if (getBean() != null){
+        if (values != null){
+            init = true;
+            jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true);
+            init = false;
+        }
+    }
+}
+protected void paramChanged(){
+    if (fieldGearParamType.getSelectedItem() != null){
+        if (!init)
+            getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText() + "]")));
+    }
+}
+     ]]></script>
+    <Table id='body'>
+        <row>
+            <cell fill='horizontal' weightx='0.5'>
+                <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/>
+            </cell>
+            <cell fill='horizontal' weightx='0.5'>
+                <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/>
+            </cell>
+        </row>
+    </Table>
+</fr.ifremer.isisfish.ui.input.InputContentUI>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -149,7 +149,7 @@
         </row>
         <row>
             <cell columns='2' fill='both' weightx='1.0'  weighty='1.0'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{false}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -122,13 +122,13 @@
                             <JPanel/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/>
+                            <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/>
                         </cell>
                     </row>
                     <row>
                         <cell columns="2" fill='both' weightx='1.0'>
                             <InputOneEquationUI id="strategyInactivity" constructorParams='this'
-                                lblText='{_("isisfish.strategy.inactivity")}'
+                                lblText='{_("isisfish.strategy.inactivity")}' actif='{fieldUseEquationInactivity.isSelected()}'
                                 bean='{getBean()}'  nameEquation='Inactivity' methodGet='InactivityEquation' methodSet='EquationInactivity'
                                 clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}'
                                 decorator='boxed' _bean='{StrategyImpl.class}' _method='"Inactivity"'/>

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

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -50,7 +50,7 @@
     </script>
     <JTabbedPane id="sensitivityTabs" constraints="BorderLayout.CENTER">
         <tab title='isisfish.params.title'>
-            <ParamsUI id='paramsUI' constructorParams='getContextValue(SimulAction.class)'/>
+            <ParamsUI id='paramsUI' sensitivity='{true}' constructorParams='getContextValue(SimulAction.class)'/>
         </tab>
         <tab title='isisfish.sensitivityChooser.title'>
             <SensitivityChooserUI id="sensitivityChooserUI" constructorParams='new JAXXInitialContext().add(this)'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-03-12 11:44:11 UTC (rev 1949)
@@ -36,359 +36,355 @@
     <Boolean id='sensitivity' javaBean='false'/>
 
     <script><![CDATA[
-    import static org.codelutin.i18n.I18n._;
-    import fr.ifremer.isisfish.ui.Common;
-    import fr.ifremer.isisfish.datastore.RuleStorage;
-    import fr.ifremer.isisfish.ui.WelcomeUI;
-    import fr.ifremer.isisfish.ui.WelcomePanelUI;
-    import fr.ifremer.isisfish.ui.WelcomeTabUI;
-    import fr.ifremer.isisfish.simulator.SimulationParameter;
-    import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
-    import fr.ifremer.isisfish.entities.Strategy;
-    import fr.ifremer.isisfish.entities.Population;
-    import fr.ifremer.isisfish.rule.Rule;
-    import org.codelutin.math.matrix.gui.MatrixPanelEditor;
-    import javax.swing.table.DefaultTableModel;
-    import java.text.ParseException;
-    import java.util.logging.Level;
-    import java.util.logging.Logger;
-    import java.awt.event.ItemEvent;
-    import javax.swing.table.TableModel;
-    import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-    import javax.swing.table.TableColumn;
-    import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
-    import static javax.swing.JOptionPane.showMessageDialog;
-    import javax.swing.text.JTextComponent;
-    import org.dom4j.DocumentHelper;
-    import org.dom4j.Element;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationService;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
-    import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
-    import fr.ifremer.isisfish.entities.FisheryRegionImpl;
-    import fr.ifremer.isisfish.datastore.StorageException;
-    import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
-    SimulationServiceListener simulationListener;
+import static org.codelutin.i18n.I18n._;
+import fr.ifremer.isisfish.ui.Common;
+import fr.ifremer.isisfish.datastore.RuleStorage;
+import fr.ifremer.isisfish.ui.WelcomeUI;
+import fr.ifremer.isisfish.ui.WelcomePanelUI;
+import fr.ifremer.isisfish.ui.WelcomeTabUI;
+import fr.ifremer.isisfish.simulator.SimulationParameter;
+import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
+import fr.ifremer.isisfish.entities.Strategy;
+import fr.ifremer.isisfish.entities.Population;
+import fr.ifremer.isisfish.rule.Rule;
+import org.codelutin.math.matrix.gui.MatrixPanelEditor;
+import javax.swing.table.DefaultTableModel;
+import java.text.ParseException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.awt.event.ItemEvent;
+import javax.swing.table.TableModel;
+import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+import javax.swing.table.TableColumn;
+import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor;
+import static javax.swing.JOptionPane.showMessageDialog;
+import javax.swing.text.JTextComponent;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import fr.ifremer.isisfish.simulator.launcher.SimulationService;
+import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
+import fr.ifremer.isisfish.entities.FisheryRegionImpl;
+import fr.ifremer.isisfish.datastore.StorageException;
+import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
+SimulationServiceListener simulationListener;
 
-	simulationListener = new SimulationServiceListener() {
-        @Override
-        public void simulationStart(SimulationService simService, SimulationJob job) {
-        }
+simulationListener = new SimulationServiceListener() {
+    @Override
+    public void simulationStart(SimulationService simService, SimulationJob job) {
+    }
 
-        @Override
-        public void simulationStop(SimulationService simService, SimulationJob job) {
-            fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true));
-        }
+    @Override
+    public void simulationStop(SimulationService simService, SimulationJob job) {
+        fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true));
+    }
 
-        @Override
-        public void clearJobDone(SimulationService simService) {
-        }
+    @Override
+    public void clearJobDone(SimulationService simService) {
     }
-    
-    public ParamsUI(SimulAction action){
-         
-        setContextValue(action);
+}
+
+public ParamsUI(SimulAction action){
+
+    setContextValue(action);
+}
+public void refresh(){
+    SimulationService.getService().removeSimulationServiceListener(simulationListener);
+    SimulationService.getService().addSimulationServiceListener(simulationListener);
+    if (getContextValue(SimulAction.class).getSimulationStorage() != null){
+        fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName());
     }
-    public void refresh(){
-        setSensitivity(getParentContainer(SensitivityUI.class) != null);
-        SimulationService.getService().removeSimulationServiceListener(simulationListener);
-        SimulationService.getService().addSimulationServiceListener(simulationListener);
-        if (getContextValue(SimulAction.class).getSimulationStorage() != null){
-            fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName());
-        }
-        fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription());
-        setListSimulParamsStrategiesItems();
-        setListSimulParamsPopulationsItems();
-        setRulesItems();
-        fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName());
-        if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){
-            SimulUI simul = getParentContainer(SimulUI.class);
-            simul.enablePreSimul();
-        }
-        if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){
-            SimulUI simul = getParentContainer(SimulUI.class);
-            simul.enableAnalysePlan();
-        }
+    fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription());
+    setListSimulParamsStrategiesItems();
+    setListSimulParamsPopulationsItems();
+    setRulesItems();
+    fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName());
+    if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){
+        SimulUI simul = getParentContainer(SimulUI.class);
+        simul.enablePreSimul();
     }
-//    public void setSimulName(String name){
-//        fieldSimulParamsName.setText(name);
-//    }
-    protected void regionChange(ItemEvent e){
-        if (e.getStateChange() == ItemEvent.SELECTED) {
-            // le premier item est " " pour ne pas avoir de selection par defaut
-            final String selected = fieldSimulParamsRegion.getSelectedItem().toString();
-            if (log.isDebugEnabled()) {
-                log.debug(" selected " + selected);
-            }
-            if(selected != null && !selected.trim().isEmpty()) {        	
-            	getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region"));
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        getContextValue(SimulAction.class).regionChange(selected);
-                        refresh();
-                        if (isSensitivity()){
-                            try {
-                                getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion());
-                                getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel();
-                            } catch (StorageException ex) {
-                                log.debug(ex.getMessage(), ex);
-                            };
-                        }
-                        getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded"));
-                    }
-                });
-           	}
-        }
+    if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){
+        SimulUI simul = getParentContainer(SimulUI.class);
+        simul.enableAnalysePlan();
     }
-    public void setSimulationParameter(SimulAction simulAction){
-       getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter());
-    }
-    protected void loadOldSimulation(){
-        final String selected = fieldSimulParamsSelect.getSelectedItem().toString();
+}
+protected void regionChange(ItemEvent e){
+    if (e.getStateChange() == ItemEvent.SELECTED) {
         // le premier item est " " pour ne pas avoir de selection par defaut
-        if (selected != null && !selected.equals(" ")){        	
-        	getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.old.simulation"));
-                SwingUtilities.invokeLater(new Runnable() {
+        final String selected = fieldSimulParamsRegion.getSelectedItem().toString();
+        if (log.isDebugEnabled()) {
+            log.debug(" selected " + selected);
+        }
+        if(selected != null && !selected.trim().isEmpty()) {
+            getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region"));
+            SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    getContextValue(SimulAction.class).loadOldSimulation(selected);
+                    getContextValue(SimulAction.class).regionChange(selected);
                     refresh();
-                    getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.old.simulation.loaded"));
+                    if (isSensitivity()){
+                        try {
+                            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion());
+                            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel();
+                        } catch (StorageException ex) {
+                            log.debug(ex.getMessage(), ex);
+                        };
+                    }
+                    getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded"));
                 }
             });
-            
         }
     }
-    protected void addRules(){
-       getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString());
-       setRulesItems();
+}
+public void setSimulationParameter(SimulAction simulAction){
+   getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter());
+}
+protected void loadOldSimulation(){
+    final String selected = fieldSimulParamsSelect.getSelectedItem().toString();
+    // le premier item est " " pour ne pas avoir de selection par defaut
+    if (selected != null && !selected.equals(" ")){
+        getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.old.simulation"));
+            SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                getContextValue(SimulAction.class).loadOldSimulation(selected);
+                refresh();
+                getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.old.simulation.loaded"));
+            }
+        });
+
     }
-    protected void removeRules(){
-       getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList.getSelectedValue().toString());
-       setRulesItems();
+}
+protected void addRules(){
+   getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString());
+   setRulesItems();
+}
+protected void removeRules(){
+   getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList.getSelectedValue().toString());
+   setRulesItems();
+}
+protected void clearRules(){
+   getContextValue(SimulAction.class).getSimulationParameter().clearRules();
+   setRulesItems();
+}
+protected void simul(){
+    if (!isSensitivity()){
+        getContextValue(SimulAction.class).launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
-    protected void clearRules(){
-       getContextValue(SimulAction.class).getSimulationParameter().clearRules();
-       setRulesItems();
+    else{
+        getContextValue(SimulAction.class).launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
     }
-    protected void simul(){
-        if (!isSensitivity()){
-            getContextValue(SimulAction.class).launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
-        }
-        else{
-            getContextValue(SimulAction.class).launchSimulationWhithSensibility(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
-        }
-        getParentContainer(WelcomeTabUI.class).selTab(5);
+    getParentContainer(WelcomeTabUI.class).selTab(5);
+}
+protected void enablePreSimul(){
+    if (fieldUseSimulPreScripts.isSelected()){
+        SimulUI simul = getParentContainer(SimulUI.class);
+        simul.enablePreSimul();
     }
-    protected void enablePreSimul(){
-        if (fieldUseSimulPreScripts.isSelected()){
-            SimulUI simul = getParentContainer(SimulUI.class);
-            simul.enablePreSimul();
-        }
+}
+protected void enableAnalysePlan(){
+    if (fieldSimulUseAnalysePlan.isSelected()){
+        getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(true);
+        SimulUI simul = getParentContainer(SimulUI.class);
+        simul.enableAnalysePlan();
     }
-    protected void enableAnalysePlan(){
-        if (fieldSimulUseAnalysePlan.isSelected()){
-            getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(true);
-            SimulUI simul = getParentContainer(SimulUI.class);
-            simul.enableAnalysePlan();
-        }
-        else{
-            getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(false);
-        }
+    else{
+        getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(false);
     }
-    protected void enableOnlyExport(){
-        if (fieldSimulOnlyExport.isSelected()){
-            getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(true);
-        }
-        else{
-            getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(false);
-        }
+}
+protected void enableOnlyExport(){
+    if (fieldSimulOnlyExport.isSelected()){
+        getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(true);
     }
-    protected void setNbAnnees(){
-        getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText());
+    else{
+        getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(false);
     }
-    protected void setListSimulParamsStrategiesItems(){
-        DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel();
-        java.util.List<Strategy> strategies = getContextValue(SimulAction.class).getStrategies();
-        for (Strategy s : strategies){
-            listSimulParamsStrategiesModel.addElement(s);
-        }
-        listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
-        java.util.List<Strategy> strategiesSelected = getContextValue(SimulAction.class).getSimulationParameter().getStrategies();
-        if (listSimulParamsStrategiesModel.size() != 0){
-            int[] indexs = new int[listSimulParamsStrategiesModel.size()];
-            int i = 0;
-            for (Strategy s : strategiesSelected){
-                indexs[i] = listSimulParamsStrategiesModel.indexOf(s);
-                i++;
-            }
-            listSimulParamsStrategies.setSelectedIndices(indexs);
-            strategySelected();
-        }
+}
+protected void setNbAnnees(){
+    getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText());
+}
+protected void setListSimulParamsStrategiesItems(){
+    DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel();
+    java.util.List<Strategy> strategies = getContextValue(SimulAction.class).getStrategies();
+    for (Strategy s : strategies){
+        listSimulParamsStrategiesModel.addElement(s);
     }
-    protected void setListSimulParamsPopulationsItems(){
-        DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel();
-        java.util.List<Population> populations = getContextValue(SimulAction.class).getPopulations();
-        for (Population p : populations){
-            listSimulParamsPopulationsModel.addElement(p);
+    listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
+    java.util.List<Strategy> strategiesSelected = getContextValue(SimulAction.class).getSimulationParameter().getStrategies();
+    if (listSimulParamsStrategiesModel.size() != 0){
+        int[] indexs = new int[listSimulParamsStrategiesModel.size()];
+        int i = 0;
+        for (Strategy s : strategiesSelected){
+            indexs[i] = listSimulParamsStrategiesModel.indexOf(s);
+            i++;
         }
-        listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
-        java.util.List<Population> populationsSelected = getContextValue(SimulAction.class).getSimulationParameter().getPopulations();
-        if (listSimulParamsPopulationsModel.size() != 0){
-            int[] indexs = new int[listSimulParamsPopulationsModel.size()];
-            int i = 0;
-            for (Population p : populationsSelected){
-                indexs[i] = listSimulParamsPopulationsModel.indexOf(p);
-                i++;
-            }
-            listSimulParamsPopulations.setSelectedIndices(indexs);
-            populationSelected();
-        }
+        listSimulParamsStrategies.setSelectedIndices(indexs);
+        strategySelected();
     }
-    protected void setRulesItems(){
-       listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray());
-       setRulesButton();
+}
+protected void setListSimulParamsPopulationsItems(){
+    DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel();
+    java.util.List<Population> populations = getContextValue(SimulAction.class).getPopulations();
+    for (Population p : populations){
+        listSimulParamsPopulationsModel.addElement(p);
     }
-    protected void populationSelected(){
-        if (listSimulParamsPopulations.getSelectedIndex() != -1){
-            getContextValue(SimulAction.class).setPopulations(listSimulParamsPopulations.getSelectedValues());
-            simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue()));
+    listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
+    java.util.List<Population> populationsSelected = getContextValue(SimulAction.class).getSimulationParameter().getPopulations();
+    if (listSimulParamsPopulationsModel.size() != 0){
+        int[] indexs = new int[listSimulParamsPopulationsModel.size()];
+        int i = 0;
+        for (Population p : populationsSelected){
+            indexs[i] = listSimulParamsPopulationsModel.indexOf(p);
+            i++;
         }
+        listSimulParamsPopulations.setSelectedIndices(indexs);
+        populationSelected();
     }
-    protected void strategySelected(){
-        getContextValue(SimulAction.class).setStrategies(listSimulParamsStrategies.getSelectedValues());
+}
+protected void setRulesItems(){
+   listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray());
+   setRulesButton();
+}
+protected void populationSelected(){
+    if (listSimulParamsPopulations.getSelectedIndex() != -1){
+        getContextValue(SimulAction.class).setPopulations(listSimulParamsPopulations.getSelectedValues());
+        simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue()));
     }
-    protected void saveDescription(){
-        getContextValue(SimulAction.class).getSimulationParameter().setDescription(fieldSimulParamsDesc.getText());
-    }
-    protected void setRulesButton(){
-       if (getContextValue(SimulAction.class).getRules().toArray().length == 0){
-           buttonSimulParamsMesuresClear.setEnabled(false);
-           buttonSimulParamsMesuresRemove.setEnabled(false);
-       }
-       else{
-            if (listSimulParamsMesuresList.getSelectedIndex() != -1){
-                buttonSimulParamsMesuresRemove.setEnabled(true);
-                setSimulParamsRulesModel();
-            }
-            buttonSimulParamsMesuresClear.setEnabled(true);
-       }
-    }
-     protected void setSimulParamsRulesModel(){
-        DefaultTableModel model = new DefaultTableModel();
-        Map<String, Class> values;
+}
+protected void strategySelected(){
+    getContextValue(SimulAction.class).setStrategies(listSimulParamsStrategies.getSelectedValues());
+}
+protected void saveDescription(){
+    getContextValue(SimulAction.class).getSimulationParameter().setDescription(fieldSimulParamsDesc.getText());
+}
+protected void setRulesButton(){
+   if (getContextValue(SimulAction.class).getRules().toArray().length == 0){
+       buttonSimulParamsMesuresClear.setEnabled(false);
+       buttonSimulParamsMesuresRemove.setEnabled(false);
+   }
+   else{
         if (listSimulParamsMesuresList.getSelectedIndex() != -1){
-            values = getContextValue(SimulAction.class).getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString());
-            model = new DefaultTableModel(){
-                    @Override
-                    public boolean isCellEditable(int row, int column) {
-                        boolean result = false;
-                        if (column > 0){
-                            result =true;
-                        }
-                        return result;
+            buttonSimulParamsMesuresRemove.setEnabled(true);
+            setSimulParamsRulesModel();
+        }
+        buttonSimulParamsMesuresClear.setEnabled(true);
+   }
+}
+ protected void setSimulParamsRulesModel(){
+    DefaultTableModel model = new DefaultTableModel();
+    Map<String, Class> values;
+    if (listSimulParamsMesuresList.getSelectedIndex() != -1){
+        values = getContextValue(SimulAction.class).getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString());
+        model = new DefaultTableModel(){
+                @Override
+                public boolean isCellEditable(int row, int column) {
+                    boolean result = false;
+                    if (column > 0){
+                        result =true;
                     }
-                };
-            java.util.List<Object> properties = new ArrayList<Object>();
-            java.util.List<GenericCell> cells = new ArrayList<GenericCell>();
-            for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) {
-                String name = it.next();
-                Object propertie = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString());
-                GenericCell value = new GenericCell(name, values.get(name), null);
-                properties.add(propertie);
-                cells.add(value);
-            }
-            model.addColumn("Name", cells.toArray());
-            model.addColumn("Value", properties.toArray());
+                    return result;
+                }
+            };
+        java.util.List<Object> properties = new ArrayList<Object>();
+        java.util.List<GenericCell> cells = new ArrayList<GenericCell>();
+        for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) {
+            String name = it.next();
+            Object propertie = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString());
+            GenericCell value = new GenericCell(name, values.get(name), null);
+            properties.add(propertie);
+            cells.add(value);
         }
-        simulParamsRules.setModel(model);
-        ParameterColumnEditor cellEditor = new ParameterColumnEditor();
-        cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage());
-        simulParamsRules.getColumnModel().getColumn(1).setCellEditor(cellEditor);
-        simulParamsRules.getModel().addTableModelListener(new TableModelListener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                int row = e.getFirstRow();
-                TableModel model = (TableModel)e.getSource();
-                GenericCell data = (GenericCell) model.getValueAt(row, 0);
-                getContextValue(SimulAction.class).setRuleParameterValue(data.getName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.getValueAt(row, 1));
-            }
-        });
+        model.addColumn("Name", cells.toArray());
+        model.addColumn("Value", properties.toArray());
     }
-    protected void selectFilter(){
-        try {
-            getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextValue(SimulAction.class).getOldSimulationItem()));
-            refresh();
-        } catch (ParseException ex) {
-            Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (IOException ex) {
-            Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex);
+    simulParamsRules.setModel(model);
+    ParameterColumnEditor cellEditor = new ParameterColumnEditor();
+    cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage());
+    simulParamsRules.getColumnModel().getColumn(1).setCellEditor(cellEditor);
+    simulParamsRules.getModel().addTableModelListener(new TableModelListener() {
+        @Override
+        public void tableChanged(TableModelEvent e) {
+            int row = e.getFirstRow();
+            TableModel model = (TableModel)e.getSource();
+            GenericCell data = (GenericCell) model.getValueAt(row, 0);
+            getContextValue(SimulAction.class).setRuleParameterValue(data.getName(), listSimulParamsMesuresList.getSelectedValue().toString(), model.getValueAt(row, 1));
         }
+    });
+}
+protected void selectFilter(){
+    try {
+        getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextValue(SimulAction.class).getOldSimulationItem()));
+        refresh();
+    } catch (ParseException ex) {
+        Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex);
+    } catch (IOException ex) {
+        Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex);
     }
-    protected ComboBoxModel getSimulParamsSelectModel() {
-        return getSimulParamsSelectModel(false);
-    }
-    protected ComboBoxModel getSimulParamsSelectModel(boolean force) {
-        java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(force);
-        DefaultComboBoxModel result = new DefaultComboBoxModel();
-        if (items != null){
-            for (String s : items){
-                result.addElement(s);
-            }
+}
+protected ComboBoxModel getSimulParamsSelectModel() {
+    return getSimulParamsSelectModel(false);
+}
+protected ComboBoxModel getSimulParamsSelectModel(boolean force) {
+    java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(force);
+    DefaultComboBoxModel result = new DefaultComboBoxModel();
+    if (items != null){
+        for (String s : items){
+            result.addElement(s);
         }
-        return result;
     }
-    protected void resetFilter(){
-        getContextValue(SimulAction.class).resetOldSimulatorNames();
-    }
-    protected void saveName(){
-        getContextValue(SimulAction.class).setName(fieldSimulParamsName.getText());
-    }
-    public Element save(){
-        Element result = DocumentHelper.createElement("paramsUI");
-        for (String name : $objectMap.keySet()){
-            Object o = $objectMap.get(name);
-            if (!name.matches("^\\$.*")){
-                Element child = DocumentHelper.createElement(name);
-                if (JComboBox.class.isInstance(o)){
-                    Object value = ((JComboBox)o).getSelectedItem();
-                    child.addAttribute("value", value.toString());
+    return result;
+}
+protected void resetFilter(){
+    getContextValue(SimulAction.class).resetOldSimulatorNames();
+}
+protected void saveName(){
+    getContextValue(SimulAction.class).setName(fieldSimulParamsName.getText());
+}
+public Element save(){
+    Element result = DocumentHelper.createElement("paramsUI");
+    for (String name : $objectMap.keySet()){
+        Object o = $objectMap.get(name);
+        if (!name.matches("^\\$.*")){
+            Element child = DocumentHelper.createElement(name);
+            if (JComboBox.class.isInstance(o)){
+                Object value = ((JComboBox)o).getSelectedItem();
+                child.addAttribute("value", value.toString());
+            }
+            if (JList.class.isInstance(o)){
+                Object[] values = ((JList)o).getSelectedValues();
+                for (Object value : values){
+                    child.add(DocumentHelper.createElement("item").addAttribute("value", value.toString()));
                 }
-                if (JList.class.isInstance(o)){
-                    Object[] values = ((JList)o).getSelectedValues();
-                    for (Object value : values){
-                        child.add(DocumentHelper.createElement("item").addAttribute("value", value.toString()));
-                    }
-                }
-                else if (JTextComponent.class.isInstance(o)){
-                    child.addText(((JTextComponent)o).getText());
-                }
-                else if (AbstractButton.class.isInstance(o)){
-                    child.addAttribute("selected", ((AbstractButton)o).isSelected() + "");
-                }
-                else if (JTable.class.isInstance(o)){
-                    JTable table = (JTable)o;
-                    for (int i=0;i<table.getColumnCount();i++){
-                        Element column = DocumentHelper.createElement("column");
-                        for (int j=0;j<table.getRowCount();j++){
-                            Element row = DocumentHelper.createElement("row");
-                            Object value = table.getValueAt(j, i);
-                            if (value != null){
-                                row.add(DocumentHelper.createElement("cell").addAttribute("value", value.toString()));
-                            }
-                            else {
-                                row.add(DocumentHelper.createElement("cell").addAttribute("value", null));
-                            }
-                            column.add(row);
+            }
+            else if (JTextComponent.class.isInstance(o)){
+                child.addText(((JTextComponent)o).getText());
+            }
+            else if (AbstractButton.class.isInstance(o)){
+                child.addAttribute("selected", ((AbstractButton)o).isSelected() + "");
+            }
+            else if (JTable.class.isInstance(o)){
+                JTable table = (JTable)o;
+                for (int i=0;i<table.getColumnCount();i++){
+                    Element column = DocumentHelper.createElement("column");
+                    for (int j=0;j<table.getRowCount();j++){
+                        Element row = DocumentHelper.createElement("row");
+                        Object value = table.getValueAt(j, i);
+                        if (value != null){
+                            row.add(DocumentHelper.createElement("cell").addAttribute("value", value.toString()));
                         }
-                        child.add(column);
+                        else {
+                            row.add(DocumentHelper.createElement("cell").addAttribute("value", null));
+                        }
+                        column.add(row);
                     }
+                    child.add(column);
                 }
-                result.add(child);
             }
+            result.add(child);
         }
-        return result;
     }
+    return result;
+}
     ]]>
     </script>
     <row>
@@ -421,7 +417,7 @@
                         <Table>
                             <row>
                                 <cell fill="horizontal">
-                                    <JLabel text="isisfish.params.simulationName" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/>
+                                    <JLabel id='lblName' text='{isSensitivity() ? _("isisfish.params.sensibilityName") : _("isisfish.params.simulationName")}' minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/>
                                 </cell>
                                 <cell  fill="both"  weightx="1.0">
                                     <JTextField id="fieldSimulParamsName" onFocusLost='saveName()'/>
@@ -586,10 +582,10 @@
             <Table>
                 <row>
                     <cell fill="horizontal" weightx="0.3">
-                        <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" onItemStateChanged='enablePreSimul()'/>
+                        <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()'/>
                     </cell>
                     <cell fill="horizontal" weightx="0.3">
-                        <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" onItemStateChanged='enableAnalysePlan()'/>
+                        <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()'/>
                     </cell>
                     <cell fill="horizontal" weightx="0.3">
                         <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport" onItemStateChanged='enableOnlyExport()'/>

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-03-12 11:44:11 UTC (rev 1949)
@@ -625,6 +625,8 @@
 isisfish.params.onlyExportSimulation=Only export simulation
 isisfish.params.populationNumbers=Population numbers input
 isisfish.params.ruleParameters=Rule's parameters
+isisfish.params.sensibility=Sensibility
+isisfish.params.sensibilityName=Sensitivity name
 isisfish.params.simulationName=Simulation name
 isisfish.params.title=Parameters
 isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n
@@ -683,14 +685,14 @@
 isisfish.populationMigration.useEquation=Use equation
 isisfish.populationMigrationEmigration.coefficient=Coefficient
 isisfish.populationMigrationEmigration.departureZone=Departure Zone
-isisfish.populationMigrationEmigration.title=
+isisfish.populationMigrationEmigration.title=Population emigration
 isisfish.populationMigrationImmigration.arrivalZone=Arrival Zone
 isisfish.populationMigrationImmigration.coefficient=Coefficient
-isisfish.populationMigrationImmigration.title=
+isisfish.populationMigrationImmigration.title=Population immigration
 isisfish.populationMigrationMigration.arrivalZone=Arrival Zone
 isisfish.populationMigrationMigration.coefficient=Coefficient
 isisfish.populationMigrationMigration.departureZone=Departure Zone
-isisfish.populationMigrationMigration.title=
+isisfish.populationMigrationMigration.title=Population migration
 isisfish.populationRecruitment.comments=Comments
 isisfish.populationRecruitment.recruitmentDistribution=Recruitment Distribution
 isisfish.populationRecruitment.reproductionEquation=ReproductionEquation

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-03-11 17:14:53 UTC (rev 1948)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-03-12 11:44:11 UTC (rev 1949)
@@ -625,6 +625,8 @@
 isisfish.params.onlyExportSimulation=Exporter uniquement des simulations
 isisfish.params.populationNumbers=Donn\u00E9es de population
 isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles
+isisfish.params.sensibility=Sensibilit\u00E9
+isisfish.params.sensibilityName=Nom de l'analyse de sensibilit\u00E9
 isisfish.params.simulationName=Nom de la simulation
 isisfish.params.title=Param\u00E8tres
 isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n
@@ -683,14 +685,14 @@
 isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation
 isisfish.populationMigrationEmigration.coefficient=Coefficient
 isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part
-isisfish.populationMigrationEmigration.title=
+isisfish.populationMigrationEmigration.title=Population emmigration
 isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e
 isisfish.populationMigrationImmigration.coefficient=Coefficient
-isisfish.populationMigrationImmigration.title=
+isisfish.populationMigrationImmigration.title=Population immigration
 isisfish.populationMigrationMigration.arrivalZone=Zone d'arriv\u00E9e
 isisfish.populationMigrationMigration.coefficient=Coefficient
 isisfish.populationMigrationMigration.departureZone=Zone de d\u00E9part
-isisfish.populationMigrationMigration.title=
+isisfish.populationMigrationMigration.title=Population migration
 isisfish.populationRecruitment.comments=Commentaires
 isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement
 isisfish.populationRecruitment.reproductionEquation=Equation de reproduction
@@ -855,7 +857,7 @@
 isisfish.sensWizardPanels.values=Valeurs
 isisfish.sensibilityWizard.title=Sensibility Wizard
 isisfish.sensitivity.title=S\u00E9lection des facteurs
-isisfish.sensitivityChooser.title=S\u00E9lection des sensibilit\u00E9es
+isisfish.sensitivityChooser.title=Param\u00E8tres de la sensibilit\u00E9
 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH
 isisfish.setOfVessels.comments=Commentaires
 isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes

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

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

    

r1949 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator resources/i18n resources/icons

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)