[Isis-fish-commits] r1681 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input result script simulator

18 Dec 2008

Author: sletellier
Date: 2008-12-18 12:16:30 +0000 (Thu, 18 Dec 2008)
New Revision: 1681

Removed:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.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/TripTypeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
Log:
Debug vol5

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -39,8 +39,8 @@
     import fr.ifremer.isisfish.ui.result.ResultAction;
     import fr.ifremer.isisfish.ui.result.ResultView;
     import fr.ifremer.isisfish.ui.script.ScriptUI;
-    import fr.ifremer.isisfish.ui.simulator.SimulQueueUI;
     import fr.ifremer.isisfish.ui.simulator.SimulUI;
+    import fr.ifremer.isisfish.ui.simulator.QueueUI;
     import fr.ifremer.isisfish.IsisFish;
     import fr.ifremer.isisfish.IsisConfig;
     import javax.swing.JFrame;
@@ -67,12 +67,15 @@
     }
     protected void updateVCS(){
 // FIXME a reimplanter
+// thread:Welcome.updateVCS()
     }
     protected void config(){
 // FIXME a reimplanter
+// Welcome.showConfig()
     }
     protected void configVCS(){
 // FIXME a reimplanter
+// fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch()
     }
     protected void help(){
 // FIXME a reimplanter
@@ -108,7 +111,7 @@
             <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new InputAction()), _("isisfish.input.title"))'/>
             <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/>
             <JSeparator/>
-            <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new SimulQueueUI(), _("isisfish.queue.title"))'/>
+            <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/>
             <JSeparator/>
             <JMenu text="isisfish.welcome.menu.configuration">
                 <JMenuItem text="isisfish.welcome.menu.configuration"  onActionPerformed='config()'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -144,7 +144,7 @@
                  valueChanged(true);
              }
         }
-        refresh();
+//        refresh();
     }
     protected void remove(){
             fr.ifremer.isisfish.entities.SetOfVessels setOfVessels = getContextValue(InputAction.class).getSetOfVessels();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -53,9 +53,18 @@
         protected OpenMapToolPanel toolMap = new OpenMapToolPanel();
         protected OMToolSet toolSet = new OMToolSet();
 
+        init();
         public FisheryRegionUI(InputAction action){
             setContextValue(action);
         }
+        protected void init(){
+            cellMap = new IsisMapBean();
+            toolSet.setupListeners(cellMap);
+            toolMap.add((Component)toolSet);
+            fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH);
+            fisheryRegionMapPanel.add(cellMap, BorderLayout.CENTER);
+
+        }
         public void refresh(){
             jaxx.runtime.Util.assignment(region = getContextValue(InputAction.class).getFisheryRegion(), "region", fr.ifremer.isisfish.ui.input.FisheryRegionUI.this);
             fieldRegion.setText(region.getName());
@@ -70,15 +79,8 @@
             refreshMap();
         }
         protected void refreshMap(){
-            cellMap = new IsisMapBean();
             cellMap.setFisheryRegion(region);
-            cellMap.setSelectionMode(0);
-            toolSet.setupListeners(cellMap);
-            toolMap.add((Component)toolSet);
-            fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH);
-            fisheryRegionMapPanel.add(cellMap, BorderLayout.CENTER);
             cellMap.repaint();
-//            cellMap.setSelectedCells(cell);
         }
         protected void setFieldMapfilesModel(FisheryRegion region){
             DefaultListModel model = new DefaultListModel();

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	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -131,7 +131,9 @@
 //        valueChanged(true);
     }
     protected void paramPossibleValueChanged(){
-        getContextValue(InputAction.class).getGear().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()));
+        if (fieldGearParamPossibleValue.getText() != ""){
+            getContextValue(InputAction.class).getGear().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()));
+        }
         valueChanged(true);
     }
     protected void commentChanged(){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -274,14 +274,17 @@
     }
     protected void importRegion(){
         setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegion()));
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(_("isisfish.message.import.finished"));
     }
     protected void importRegionAndRename(){
         setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegionAndRename()));
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(_("isisfish.message.import.finished"));
     }
     protected void importV2Region(){
         setInfoText(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region());
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(_("isisfish.message.import.finished"));
     }
     protected void importRegionFromSimulation(){
@@ -289,23 +292,23 @@
     }
     protected void exportRegion(){
         setInfoText(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion()));
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(_("isisfish.message.export.done"));
     }
     protected void copyRegion(){
         setInfoText(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion()));
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(_("isisfish.message.copy.finished"));
     }
     protected void removeRegion(){
         setInfoText(_("isisfish.message.removing.region" + getContextValue(InputAction.class).getRegionStorage().getName()));
+        fieldCurrentRegion.setModel(getFieldCurrentRegionModel());
         setInfoText(getContextValue(InputAction.class).removeRegion(false));
     }
     protected void commitRegionInCVS(){
         setInfoText(_("isisfish.message.commiting.region" + getContextValue(InputAction.class).getRegionStorage().getName()));
         setInfoText(getContextValue(InputAction.class).commitRegionInCVS());
     }
-    protected void about(){
-        // TODO
-    }
     ]]>
     </script>
     <JMenuBar id="menu" constraints='BorderLayout.NORTH'>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -235,16 +235,20 @@
         }
     }
     protected void saveGrowthReverseModel(){
-        Equation e = getEquation();
-        if (e != null){
-             getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent());
-        }
+
+        getContextValue(InputAction.class).saveAsModel("Population", "Java", editor.getText());
+        setInfoText(_("isisfish.message.saveModel.finished"));
+//        Equation e = getEquation();
+//        if (e != null){
+//             getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent());
+//        }
     }
     protected void openGrowthReverseEditor(){
-        Equation e = getEquation();
-        if (e != null){
-             getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, e.getContent(), editorReverse);
-        }
+        getContextValue(InputAction.class).openEditor("PopulationGrowth","new",fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, editorReverse.getText(), editorReverse);
+//        Equation e = getEquation();
+//        if (e != null){
+//             getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, e.getContent(), editorReverse);
+//        }
     }
     protected void commentChanged(){
         pop.setComment(fieldPopulationBasicsComment.getText());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -130,6 +130,7 @@
     }
     protected void saveAsModel(){
         getContextValue(InputAction.class).saveAsModel("Selectivity", "Java", fieldSelectivityScript.getText());
+        refresh();
         setInfoText(_("isisfish.message.saveModel.finished"));
     }
     protected void setInfoText(String txt){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -175,7 +175,7 @@
         root.setInfoText(txt);
     }
     protected void valueChanged(boolean b){
-        getParentContainer(GearUI.class).setChanged(b);
+        getParentContainer(SetOfVesselsUI.class).setChanged(b);
         save.setEnabled(b);
         cancel.setEnabled(b);
     }
@@ -233,8 +233,7 @@
         setInfoText(_("isisfish.message.saveModel.finished"));
     }
     protected void openEditor(){
-        fr.ifremer.isisfish.entities.SetOfVessels setOfVessels = getContextValue(InputAction.class).getSetOfVessels();
-        getContextValue(InputAction.class).openEditor(setOfVessels.getTechnicalEfficiencyEquation().getCategory(),"new",fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class, editor.getText(), editor);
+            getContextValue(InputAction.class).openEditor("SetOfVessels","new",fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class, editor.getText(), editor);
     }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -73,7 +73,6 @@
             fieldSpeciesComment.setText("");
             goToPopulation.setEnabled(false);
         }
-        valueChanged(false);
     }
     protected void create(){
         TopiaEntity topia = getContextValue(InputAction.class).create("Species");
@@ -100,7 +99,6 @@
         setInfoText(getContextValue(InputAction.class).remove());
         getParentContainer(InputUI.class).setTreeModel();
         getParentContainer(InputUI.class).setTreeSelection("$root/$species");
-        valueChanged(false);
         refresh();
     }
     protected void goToPopulation(){
@@ -119,32 +117,26 @@
     protected void commentChanged(){
         getContextValue(InputAction.class).getSpecies().setComment(fieldSpeciesComment.getText());
         valueChanged(true);
-        refresh();
     }
     protected void dynamicAgeChanged(){
         getContextValue(InputAction.class).getSpecies().setAgeGroupType(fieldSpeciesDynamicAge.isSelected());
         valueChanged(true);
-        refresh();
     }
     protected void CEEChanged(){
         getContextValue(InputAction.class).getSpecies().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()));
         valueChanged(true);
-        refresh();
     }
     protected void codeChanged(){
         getContextValue(InputAction.class).getSpecies().setCodeRubbin(fieldSpeciesCodeRubbin.getText());
         valueChanged(true);
-        refresh();
     }
     protected void scientificNameChanged(){
         getContextValue(InputAction.class).getSpecies().setScientificName(fieldSpeciesScientificName.getText());
         valueChanged(true);
-        refresh();
     }
     protected void nameChanged(){
         getContextValue(InputAction.class).getSpecies().setName(fieldSpeciesName.getText());
         valueChanged(true);
-        refresh();
     }
     ]]>
     </script>
@@ -156,7 +148,7 @@
                         <JLabel text="isisfish.species.name" enabled='{isActif()}'/>
                     </cell>
                     <cell fill='horizontal' columns='2' weightx='1.0'>
-                        <JTextField id="fieldSpeciesName" onFocusLost='nameChanged()' enabled='{isActif()}'/>
+                        <JTextField id="fieldSpeciesName" onKeyTyped='valueChanged(true)' onFocusLost='nameChanged()' enabled='{isActif()}'/>
                     </cell>
                 </row>
                 <row>
@@ -164,7 +156,7 @@
                         <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/>
                     </cell>
                     <cell fill='horizontal' columns='2' weightx='1.0'>
-                        <JTextField id="fieldSpeciesScientificName" onFocusLost='scientificNameChanged()' enabled='{isActif()}'/>
+                        <JTextField id="fieldSpeciesScientificName" onKeyTyped='valueChanged(true)' onFocusLost='scientificNameChanged()' enabled='{isActif()}'/>
                     </cell>
                 </row>
                 <row>
@@ -172,7 +164,7 @@
                         <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/>
                     </cell>
                     <cell fill='horizontal' columns='2' weightx='1.0'>
-                        <JTextField id="fieldSpeciesCodeRubbin" onFocusLost='codeChanged()' enabled='{isActif()}'/>
+                        <JTextField id="fieldSpeciesCodeRubbin" onKeyTyped='valueChanged(true)' onFocusLost='codeChanged()' enabled='{isActif()}'/>
                     </cell>
                 </row>
                 <row>
@@ -180,7 +172,7 @@
                          <JLabel text="isisfish.species.cee" enabled='{isActif()}'/>
                     </cell>
                     <cell fill='horizontal' columns='2' weightx='1.0'>
-                        <JTextField id="fieldSpeciesCEE" onFocusLost='CEEChanged()' enabled='{isActif()}'/>
+                        <JTextField id="fieldSpeciesCEE" onKeyTyped='valueChanged(true)' onFocusLost='CEEChanged()' enabled='{isActif()}'/>
                     </cell>
                 </row>
                 <row>
@@ -200,7 +192,7 @@
                     </cell>
                     <cell fill='both' columns='2' weightx='1.0' weighty='1.0'>
                          <JScrollPane>
-                                <JTextArea id="fieldSpeciesComment" onFocusLost='commentChanged()' enabled='{isActif()}'/>
+                                <JTextArea id="fieldSpeciesComment" onKeyTyped='valueChanged(true)' onFocusLost='commentChanged()' enabled='{isActif()}'/>
                           </JScrollPane>
                     </cell>
                 </row>

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	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -131,11 +131,11 @@
 //        GenericCell g = (GenericCell)fieldStrategyInactivity.getSelectedItem();
 //        getContextValue(InputAction.class).saveEquationAsModel((Equation)g.getValue());
         getContextValue(InputAction.class).saveAsModel("Strategy", "Java", editor.getText());
+        refresh();
         setInfoText(_("isisfish.message.saveModel.finished"));
     }
     protected void openEditor(){
-        fr.ifremer.isisfish.entities.Strategy strategy = getContextValue(InputAction.class).getStrategy();
-        getContextValue(InputAction.class).openEditor(strategy.getInactivityEquation().getContent(),"new",fr.ifremer.isisfish.equation.StrategyInactivityEquation.class, editor.getText(), editor);
+        getContextValue(InputAction.class).openEditor("Strategy","new",fr.ifremer.isisfish.equation.StrategyInactivityEquation.class, editor.getText(), editor);
     }
     protected void create(){
         TopiaEntity topia = getContextValue(InputAction.class).create("Strategy");

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -79,11 +79,11 @@
         valueChanged(true);
     }
     protected void typeDurationChanged(){
-        getContextValue(InputAction.class).getTripType().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText())));
+        getContextValue(InputAction.class).getTripType().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600));
         valueChanged(true);
     }
     protected void minTimeChanged(){
-        getContextValue(InputAction.class).getTripType().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText())));
+        getContextValue(InputAction.class).getTripType().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600));
         valueChanged(true);
     }
     protected void commentChanged(){

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	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -181,7 +181,6 @@
     }
     protected void nameChange(){
         getContextValue(InputAction.class).getZone().setName(fieldZoneName.getText());
-        valueChanged(true);
     }
     protected void valueChanged(boolean b){
         changed = b;
@@ -202,7 +201,7 @@
                     </row>
                     <row>
                         <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldZoneName" enabled='{isActif()}' onKeyTyped='nameChange()'/>
+                            <JTextField id="fieldZoneName" enabled='{isActif()}' onKeyTyped='valueChanged(true)' onFocusLost='nameChange()'/>
 <!--  onFocusLost='nameChange()' -->
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java	2008-12-18 12:16:30 UTC (rev 1681)
@@ -10,12 +10,18 @@
 * @version
 */
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import static org.codelutin.i18n.I18n._;
 
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.logging.SimulationLoggerUtil;
 import fr.ifremer.isisfish.simulator.SimulationProperties;
+import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+import fr.ifremer.isisfish.simulator.launcher.SimulationService;
+import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
 import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
+import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
 import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -38,12 +44,35 @@
 
     public ResultView (){
         super();
+
+        SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() {
+
+            @Override
+            public void simulationStart(SimulationService simService, SimulationJob job) {
+            }
+
+            @Override
+            public void simulationStop(SimulationService simService, SimulationJob job) {
+                try {
+                    initSimulation();
+                } catch (IOException ex) {
+                    Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex);
+                } catch (ParseException ex) {
+                    Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            }
+
+            @Override
+            public void clearJobDone(SimulationService simService) {
+            }
+        });
         init();
 
         try {
             initSimulation();
         } catch (Exception e) {
             log.warn(_("could not create simulation filter model for reason %1$s",e.getMessage()),e);
+            showMsgBox(e);
         }
     }
 
@@ -95,6 +124,7 @@
                 initSimulation();
             } catch (Exception eee) {
                 log.warn("Can't delete simulation", eee);
+                showMsgBox(eee);
             }
         }
     }
@@ -120,6 +150,7 @@
                 intFrame.setSelected(true);
             } catch (PropertyVetoException eee) {
                 log.warn("Error dans l internalFrame ", eee);
+                showMsgBox(eee);
             }
         }
     }
@@ -131,7 +162,8 @@
             SimulationLoggerUtil.showSimulationLogConsole(name);
 
         } catch (Exception e) {
-            // ignore ?
+            log.error(e);
+            showMsgBox(e);
         }
     }
     public void on_filterSimulationLogButton_clicked() {
@@ -145,7 +177,11 @@
             }
         } catch (Exception e) {
             log.warn(_("could not filter on simulations"), e);
+            showMsgBox(e);
         }
     }
+    protected void showMsgBox(Exception eee){
+        ErrorDialogUI.showError(eee);
+    }
 
 }// ResultView

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java	2008-12-18 12:16:30 UTC (rev 1681)
@@ -13,6 +13,7 @@
 import fr.ifremer.isisfish.datastore.RuleStorage;
 import fr.ifremer.isisfish.datastore.ScriptStorage;
 import fr.ifremer.isisfish.datastore.SimulatorStorage;
+import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
 import fr.ifremer.isisfish.vcs.VCSException;
 import java.io.ByteArrayOutputStream;
@@ -58,10 +59,8 @@
     public ScriptAction(){
 
     }
-    protected void showMsgBox(String txt){
-        if (txt != null){
-            showMessageDialog(null, txt);
-        }
+    protected void showMsgBox(Exception eee){
+        ErrorDialogUI.showError(eee);
     }
     public CodeSourceStorage getCode(){
         return code;
@@ -218,7 +217,7 @@
     }
      protected void returnError(String s, Exception eee) {
         log.error(s,eee);
-        showMsgBox("error " + s);
+        showMsgBox(eee);
     }
     public void loadScript(GenericCell c, String fileName, String type){
         ScriptMapping mapping = ScriptMapping.valueOf(type);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -30,7 +30,13 @@
  * by : $Author: sletellier $
  */
  -->
+
 <Table>
+    <Boolean id='ajout' javaBean='false'/>
+
+    <Boolean id='remove' javaBean='false'/>
+
+    <Boolean id='changed' javaBean='false'/>
     <script>
     <![CDATA[
     import javax.swing.table.DefaultTableModel;
@@ -63,6 +69,7 @@
     protected void addTagValue(){
         getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText());
         setTableTagValue();
+        setRemove(true);
     }
     protected void removeTagValue(){
         getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString());
@@ -104,6 +111,69 @@
             DefaultTableModel model = new DefaultTableModel(columnName, 0);
         }
     }
+    protected void simulationStatistiqueChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());
+        valueChanged(true);
+    }
+    protected void simulationCacheChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());
+        valueChanged(true);
+    }
+
+    protected void simulErrorChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");
+        valueChanged(true);
+    }
+    protected void simulWarnChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");
+        valueChanged(true);
+    }
+    protected void simulInfoChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");
+        valueChanged(true);
+    }
+    protected void simulDebugChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");
+        valueChanged(true);
+    }
+
+    protected void scriptErrorChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");
+        valueChanged(true);
+    }
+    protected void scriptWarnChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");
+        valueChanged(true);
+    }
+    protected void scriptInfoChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");
+        valueChanged(true);
+    }
+    protected void scriptDebugChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");
+        valueChanged(true);
+    }
+
+    protected void libErrorChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");
+        valueChanged(true);
+    }
+    protected void libWarnChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");
+        valueChanged(true);
+    }
+    protected void libInfoChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");
+        valueChanged(true);
+    }
+    protected void libDebugChanged(){
+        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");
+        valueChanged(true);
+    }
+    protected void valueChanged(boolean b){
+         save.setEnabled(b);
+         setChanged(b);
+    }
     ]]>
     </script>
     <row>
@@ -128,13 +198,13 @@
             <JPanel/>
         </cell>
         <cell  columns="2" fill="horizontal"  weightx="0.3">
-            <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique"/>
+            <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" onActionPerformed = 'simulationStatistiqueChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
             <JPanel/>
         </cell>
         <cell  columns="2" fill="horizontal"  weightx="0.3">
-            <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache"/>
+            <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" onActionPerformed = 'simulationCacheChanged()'/>
         </cell>
     </row>
     <row>
@@ -142,16 +212,16 @@
             <JLabel text="isisfish.advancedParams.simulLevelLogger"/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulErrorChanged()'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulWarnChanged()'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulInfoChanged()'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulDebugChanged()'/>
         </cell>
     </row>
     <row>
@@ -159,16 +229,16 @@
             <JLabel text="isisfish.advancedParams.scriptLevelLogger"/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptErrorChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptWarnChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptInfoChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptDebugChanged()'/>
         </cell>
     </row>
     <row>
@@ -176,16 +246,16 @@
             <JLabel text="isisfish.advancedParams.libLevelLogger"/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libErrorChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libWarnChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libInfoChanged()'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libDebugChanged()'/>
         </cell>
     </row>
     <row>
@@ -198,18 +268,18 @@
             <JLabel text="isisfish.common.tag"/>
         </cell>
         <cell  columns="2" fill="horizontal" weightx="0.25">
-            <JTextField id="fieldTag"/>
+            <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/>
         </cell>
         <cell fill="horizontal" weightx="0.25">
             <JLabel text="isisfish.common.value"/>
         </cell>
         <cell  columns="2" fill="horizontal" weightx="0.25">
-            <JTextField id="fieldValue"/>
+            <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/>
         </cell>
     </row>
     <row>
         <cell  columns="6" fill="horizontal"  weightx="1.0">
-            <JButton text="isisfish.common.add" onActionPerformed = 'addTagValue()'/>
+            <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/>
         </cell>
     </row>
     <row>
@@ -221,12 +291,12 @@
     </row>
     <row>
         <cell  columns="6" fill="horizontal"  weightx="1.0">
-            <JButton text="isisfish.common.remove" onActionPerformed = 'removeTagValue()'/>
-        </cell>
+            <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/>
+        </cell> 
     </row>
     <row>
         <cell  columns="6" fill="horizontal"  weightx="1.0">
-            <JButton text="isisfish.common.saveNextSimulation" onActionPerformed = 'saveTagValue()'/>
+            <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/>
         </cell>
     </row>
 </Table>	     
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -39,6 +39,13 @@
         setContextValue(action);
     }
     public void refresh(){
+        fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory());
+        listSimulExportChoose.setModel(getListSimulExportChooseModel());
+    }
+    protected DefaultComboBoxModel getListSimulExportChooseModel(){
+        return new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNames().toArray());
+    }
+    protected void exportChanged(){
         if (listSimulExportChoose.getSelectedIndex() > -1){
             Object[] values = listSimulExportChoose.getSelectedValues();
             java.util.List<String> exportNames = new LinkedList<String>();
@@ -47,18 +54,13 @@
             }
             getContextValue(SimulAction.class).getSimulationParameter().setExportNames(exportNames);
         }
-        fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory());
-        listSimulExportChoose.setModel(getListSimulExportChooseModel());
     }
-    protected DefaultComboBoxModel getListSimulExportChooseModel(){
-        return new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNames().toArray());
-    }
     ]]>
     </script>
     <row>
         <cell columns="4" fill="both" weightx="1.0" weighty="1.0">
             <JScrollPane>
-                <JList id="listSimulExportChoose" selectionMode="2" model='{getListSimulExportChooseModel()}' onValueChanged='refresh()'/>
+                <JList id="listSimulExportChoose" selectionMode="2" model='{getListSimulExportChooseModel()}' onValueChanged='exportChanged()'/>
             </JScrollPane>
         </cell>
     </row>

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	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -55,9 +55,30 @@
     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.simulator.launcher.SimulationServiceListener;
     
     setContextValue(new MatrixPanelEditor());
     simulParamsNumbers.add(getContextValue(MatrixPanelEditor.class), BorderLayout.CENTER);
+
+
+    SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() {
+
+        @Override
+        public void simulationStart(SimulationService simService, SimulationJob job) {
+        }
+
+        @Override
+        public void simulationStop(SimulationService simService, SimulationJob job) {
+            System.out.println("refresh !!!");
+            fieldSimulParamsSelect.setModel(getSimulParamsSelectModel());
+        }
+
+        @Override
+        public void clearJobDone(SimulationService simService) {
+        }
+    });
     public ParamsUI(SimulAction action){
          
         setContextValue(action);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -32,8 +32,9 @@
  -->
 <JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'>
     <script><![CDATA[
-    public ResultChoiceUI (SimulAction action){
-         
+    import fr.ifremer.isisfish.ui.WelcomePanelUI;
+
+    public ResultChoiceUI (SimulAction action){     
         setContextValue(action);
     }
     public void refresh(){
@@ -45,8 +46,13 @@
     protected void saveResultNames(){
         if (listResultNames.getSelectedIndex() != -1){
             getContextValue(SimulAction.class).saveResultNames(listResultNames.getSelectedValues());
+            setInfoText("isisfish.resultChoice.saved");
         }
     }
+    protected void setInfoText(String txt){
+        WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
+        root.setInfoText(txt);
+    }
     ]]>
     </script>
     <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -46,6 +46,7 @@
     }
     public void refresh(){
         listSimulParamsAnalysePlansList.setModel(new DefaultComboBoxModel(getContextValue(SimulAction.class).getParamAnalysePlans().toArray()));
+        setSimulParamsAnalysePlans();
     }
     public void addAnalysePlan(){
         getContextValue(SimulAction.class).addAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString());
@@ -87,16 +88,23 @@
                             return result;
                         }
                     };
+                java.util.List<GenericCell> valuesList = new ArrayList<GenericCell>();
+                java.util.List<Object> propertyList = new ArrayList<Object>();
                 for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) {
                     String name = it.next();
                     Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, listSimulParamsAnalysePlansList.getSelectedValue().toString());
                     GenericCell value = new GenericCell(name, values.get(name), null);
-                    model.setValueAt(value, row, 0);
-                    model.setValueAt(properties, row, 1);
+                    valuesList.add(value);
+                    propertyList.add(properties);
+//                        model.setValueAt(value, row, 0);
+//                        model.setValueAt(properties, row, 1);
                     row++;
                 }
+                 model.addColumn("Name", valuesList.toArray());
+                 model.addColumn("Value", propertyList.toArray());
                  simulParamsAnalysePlans.setModel(model);
                 ParameterColumnEditor cellEditor = new ParameterColumnEditor();
+                cellEditor.setName("Name");
                 cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage());
                 simulParamsAnalysePlans.getColumnModel().getColumn(1).setCellEditor(cellEditor);
                 simulParamsAnalysePlans.getModel().addTableModelListener(new TableModelListener() {

Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx	2008-12-17 17:18:58 UTC (rev 1680)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx	2008-12-18 12:16:30 UTC (rev 1681)
@@ -1,34 +0,0 @@
-<!--
-/* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
-<JPanel visible="true" size='{new Dimension(400,400)}' layout='{new BorderLayout()}'>
-</JPanel>

    

[Isis-fish-commits] r1681 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input result script simulator

sletellier＠users.labs.libre-entreprise.org