From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:43 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1564 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . simulator
Date: Tue, 14 Oct 2008 11:01:24 +0200
Message-ID: <20081014090124.E7DF1461BAF@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4436440300161137642=="

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

Author: sletellier
Date: 2008-10-14 09:01:24 +0000 (Tue, 14 Oct 2008)
New Revision: 1564

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedPar=
amsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoic=
eUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction=
.java
Log:
Migration des fichiers JAXX

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	     =
                   (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2008-=
10-14 09:01:24 UTC (rev 1564)
@@ -0,0 +1,118 @@
+<!--
+/* *##%
+ * Copyright (C) 2005
+ *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+
+/* *
+ * IsisFish.java
+ *
+ * Created: 1 aout 2005 18:37:25 CEST
+ *
+ * @author Benjamin POUSSIN <poussin at codelutin.com>
+ * @version $Revision: 1312 $
+ *
+ * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
+ * by : $Author: sletellier $
+ */
+ -->
+<JFrame id=3D'isisfishFrame' title=3D"isisfish.welcome.title" size=3D'{new D=
imension(800,600)}' resizable=3D"true" location=3D'{new Point(0,23)}' layout=
=3D'{new BorderLayout()}'>
+    <script><![CDATA[
+    import static org.codelutin.i18n.I18nf._;
+    import fr.ifremer.isisfish.ui.simulator.SimulAction;
+    import fr.ifremer.isisfish.ui.input.InputUI;
+    import fr.ifremer.isisfish.ui.input.InputAction;
+    import fr.ifremer.isisfish.ui.result.ResultUI;
+    import fr.ifremer.isisfish.ui.script.ScriptUI;
+    import fr.ifremer.isisfish.ui.simulator.SimulQueueUI;
+    import fr.ifremer.isisfish.ui.simulator.SimulUI;
+    import javax.swing.JFrame;
+    welcomePanelUI.setContent(new WelcomeTabUI());
+    protected void openFrame(Container c, String title){
+        JFrame f =3D new JFrame();
+        f.setLayout(new BorderLayout());
+        WelcomePanelUI welcome =3D new WelcomePanelUI();
+        welcome.setContent(c);
+        f.add(welcome, BorderLayout.CENTER);
+        f.setTitle(title);
+        f.setVisible(true);
+        f.pack();
+    }
+    ]]>
+    </script>
+    <JMenuBar>
+        <JMenu text=3D'isisfish.welcome.menu.file'>
+            <JMenuItem text=3D"isisfish.welcome.menu.synchro" />
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).updateVCS()"
+-->
+            <JSeparator/>
+            <JMenuItem text=3D"isisfish.welcome.menu.close"/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).close(getContextV=
alue(this.getClass()))"
+-->
+        </JMenu>
+        <JMenu text=3D"isisfish.welcome.menu.frame">
+            <JMenuItem text=3D"isisfish.welcome.menu.simulation" onActionPer=
formed=3D'openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.ti=
tle"))'/>
+            <JMenuItem text=3D"isisfish.welcome.menu.result" onActionPerform=
ed=3D'openFrame(new ResultUI(), _("isisfish.result.title"))'/>
+            <JMenuItem text=3D"isisfish.welcome.menu.input" onActionPerforme=
d=3D'openFrame(new InputUI(), _("isisfish.input.title"))'/>
+            <JMenuItem text=3D"isisfish.welcome.menu.script" onActionPerform=
ed=3D'openFrame(new ScriptUI(), _("isisfish.script.title"))'/>
+            <JSeparator/>
+            <JMenuItem text=3D"isisfish.welcome.menu.queue" onActionPerforme=
d=3D'openFrame(new SimulQueueUI(), _("isisfish.queue.title"))'/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).openSimulQueueUIF=
rame()"
+-->
+            <JSeparator/>
+            <JMenu text=3D"isisfish.welcome.menu.configuration">
+                <JMenuItem text=3D"isisfish.welcome.menu.configuration"/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).showConfig()"
+-->
+                <JMenuItem text=3D"isisfish.welcome.menu.vcs.configuration"/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).showConfigVCS()"
+-->
+            </JMenu>
+        </JMenu>
+        <JMenu text=3D"isisfish.welcome.menu.help">
+            <JMenuItem text=3D"isisfish.welcome.menu.help"/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).help()"
+-->
+            <JSeparator/>
+            <JMenuItem text=3D"isisfish.welcome.menu.monitor"/>
+<!--
+ onActionPerformed=3D"getContextValue(WelcomeAction.class).monitorUI()"
+-->
+            <JSeparator/>
+            <JMenuItem text=3D"isisfish.welcome.menu.about"/>
+<!--
+  onActionPerformed=3D"getContextValue(WelcomeAction.class).aboutUI()"
+-->
+        </JMenu>
+    </JMenuBar>
+    <WelcomePanelUI id=3D"welcomePanelUI"/>
+<!--    <JTabbedPane id=3D"simulTabs" tabPlacement=3D'{JTabbedPane.LEFT}'>
+        <tab title=3D'' icon=3D'{new ImageIcon(getClass().getResource("/imag=
es/simulation.gif"))}'><fr.ifremer.isisfish.ui.simulator.SimulUI/></tab>
+        <tab title=3D'' icon=3D'{new ImageIcon(getClass().getResource("/imag=
es/calc.gif"))}'><fr.ifremer.isisfish.ui.result.ResultUI/></tab>
+        <tab title=3D'' icon=3D'{new ImageIcon(getClass().getResource("/imag=
es/book.gif"))}'><fr.ifremer.isisfish.ui.input.InputUI/></tab>
+        <tab title=3D'' icon=3D'{new ImageIcon(getClass().getResource("/imag=
es/bookPage.gif"))}'><fr.ifremer.isisfish.ui.script.ScriptUI/></tab>
+    </JTabbedPane>
+    <JPanel constraints=3D"BorderLayout.SOUTH">
+        <StatusBarUI id=3D'statusBar'/>
+    </JPanel> -->
+</JFrame>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Adva=
ncedParamsUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedPa=
ramsUI.jaxx	2008-10-14 08:54:25 UTC (rev 1563)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedPa=
ramsUI.jaxx	2008-10-14 09:01:24 UTC (rev 1564)
@@ -55,13 +55,17 @@
         getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), f=
ieldValue.getText());
     }
     protected void removeTagValue(){
-        // getContextValue(SimulAction.class).removeTagValue(tableTagValue.g=
etValueAt(getSelectedRow(),0));
+        getContextValue(SimulAction.class).removeTagValue(tableTagValue.getV=
alueAt(tableTagValue.getSelectedRow(),0).toString());
     }
     protected void saveTagValue(){
-        // getContextValue(SimulAction.class).saveTagValue();
+        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() !=3D -1){
+            getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvPar=
amsSimulatorSelect.getSelectedItem().toString());   =20
+        }
     }
     protected void setSimulName(){
-        getContextValue(SimulAction.class).getSimulationParameter().setSimul=
atorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString());
+        if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() !=3D -1){
+            getContextValue(SimulAction.class).getSimulationParameter().setS=
imulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString());
+        }
     }
     ]]>
     </script>
@@ -102,27 +106,15 @@
         </cell>
         <cell  fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsSimulLoggerError" text=3D=
"isisfish.common.error" buttonGroup=3D"fieldSimulAdvParamsSimulLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/simulErrorLevel'
--->
         </cell>
         <cell  fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsSimulLoggerWarn" text=3D"=
isisfish.common.warn" buttonGroup=3D"fieldSimulAdvParamsSimulLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/simulWarnLevel'
--->
         </cell>
         <cell  fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsSimulLoggerInfo" text=3D"=
isisfish.common.info" buttonGroup=3D"fieldSimulAdvParamsSimulLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/simulInfoLevel'origin=3D'$SimulationParameter=
/simulInfoLevel'
--->
         </cell>
         <cell  fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsSimulLoggerDebug" text=3D=
"isisfish.common.debug" buttonGroup=3D"fieldSimulAdvParamsSimulLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/simulDebugLevel'
--->
         </cell>
     </row>
     <row>
@@ -131,27 +123,15 @@
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsScriptLoggerError" text=
=3D"isisfish.common.error" buttonGroup=3D"fieldSimulAdvParamsScriptLoggerGrou=
p"/>
-<!--
-origin=3D'$SimulationParameter/scriptErrorLevel'
--->
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsScriptLoggerWarn" text=3D=
"isisfish.common.warn" buttonGroup=3D"fieldSimulAdvParamsScriptLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/scriptWarnLevel'
--->
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsScriptLoggerInfo" text=3D=
"isisfish.common.info" buttonGroup=3D"fieldSimulAdvParamsScriptLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/scriptInfoLevel'
--->
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsScriptLoggerDebug" text=
=3D"isisfish.common.debug" buttonGroup=3D"fieldSimulAdvParamsScriptLoggerGrou=
p"/>
-<!--
-origin=3D'$SimulationParameter/scriptDebugLevel'
--->
         </cell>
     </row>
     <row>
@@ -160,24 +140,15 @@
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsLibLoggerError" text=3D"i=
sisfish.common.error" buttonGroup=3D"fieldSimulAdvParamsLibLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/libErrorLevel'
--->
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsLibLoggerWarn" text=3D"is=
isfish.common.warn" buttonGroup=3D"fieldSimulAdvParamsLibLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/libWarnLevel'
--->
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsLibLoggerInfo" text=3D"is=
isfish.common.info" buttonGroup=3D"fieldSimulAdvParamsLibLoggerGroup"/>
         </cell>
         <cell fill=3D"horizontal"  weightx=3D"0.2">
             <JRadioButton id=3D"fieldSimulAdvParamsLibLoggerDebug" text=3D"i=
sisfish.common.debug" buttonGroup=3D"fieldSimulAdvParamsLibLoggerGroup"/>
-<!--
-origin=3D'$SimulationParameter/libInfoLevel'
--->
         </cell>
     </row>
     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Expo=
rtUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.j=
axx	2008-10-14 08:54:25 UTC (rev 1563)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.j=
axx	2008-10-14 09:01:24 UTC (rev 1564)
@@ -33,6 +33,7 @@
=20
 <Table>
 <script><![CDATA[
+    fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSim=
ulationParameter().getExportDirectory());
     public ExportUI (SimulAction action){
         setContextValue(action);
     }
@@ -41,7 +42,7 @@
     <row>
         <cell columns=3D"4" fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
             <JScrollPane>
-                <JList id=3D"listSimulExportChoose" selectionMode=3D"2">
+                <JList id=3D"listSimulExportChoose" selectionMode=3D"2" mode=
l=3D'{new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNa=
mes().toArray())}'>
 <!-- Fixme : ListModel
             <ListModel origin=3D"$ExportNames"/>
             <ListSelectionEvents onValueChanged=3D"Update($listSimulExportCh=
oose/selectedValues, $SimulationParameter/exportNames)"/>
@@ -61,13 +62,13 @@
             <JTextField id=3D"fieldSimulExportFolder"/>
         </cell>
         <cell>
-            <JButton text=3D"isisfish.common.ellipsis"/>
+            <JButton text=3D"isisfish.common.ellipsis" onActionPerformed=3D'=
getContextValue(SimulAction.class).updateDirectory()'/>
 <!--
 actionCommand=3D"update(org.codelutin.util.FileUtil.getDirectory(), $Simulat=
ionParameter/exportDirectory);refreshView($fieldSimulExportFolder)"
 -->
         </cell>
         <cell>
-            <JButton text=3D"isisfish.common.saveNextSimulation"/>
+            <JButton text=3D"isisfish.common.saveNextSimulation" onActionPer=
formed=3D'getContextValue(SimulAction.class).saveExport()'/>
         </cell>
     </row>
            =20

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Resu=
ltChoiceUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoi=
ceUI.jaxx	2008-10-14 08:54:25 UTC (rev 1563)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoi=
ceUI.jaxx	2008-10-14 09:01:24 UTC (rev 1564)
@@ -35,6 +35,11 @@
     public ResultChoiceUI (SimulAction action){
         setContextValue(action);
     }
+    protected void saveResultNames(){
+        if (listResultNames.getSelectedIndex() !=3D -1){
+            getContextValue(SimulAction.class).saveResultNames(listResultNam=
es.getSelectedValues());
+        }
+    }
     ]]>
     </script>
=20
@@ -50,7 +55,7 @@
 	    <JLabel text=3D"isisfish.resultChoice.save" horizontalAlignment=3D"0" c=
onstraints=3D'BorderLayout.NORTH'/>	   =20
 	    <JScrollPane constraints=3D'BorderLayout.CENTER'>
             <!--list id=3D"listResultNames" SelectionMode=3D"2" renderer=3D"=
org.codelutin.i18n.I18n._(.)"-->
-            <JList id=3D"listResultNames" selectionMode=3D"2">
+            <JList id=3D"listResultNames" selectionMode=3D"2" model=3D'{new =
DefaultComboBoxModel(getContextValue(SimulAction.class).getResultNames().toAr=
ray())}'>
 <!-- Fixme : ListModel, ListSelectionEvents and listRender
                 origin=3D"$SimulationParameter/resultEnabled"
                 <ListModel origin=3D"$ResultNames"/>
@@ -62,7 +67,7 @@
 	        </JList>
 	    </JScrollPane>
=20
-	    <JButton constraints=3D'BorderLayout.SOUTH' text=3D"isisfish.common.sav=
eNextSimulation"/>
+	    <JButton constraints=3D'BorderLayout.SOUTH' text=3D"isisfish.common.sav=
eNextSimulation" onActionPerformed=3D'saveResultNames()'/>
 <!--
 	     actionCommand=3D"simulator.SimulatorAction.saveResultNames($listResult=
Names/selectedValues)"
 -->	   =20

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2008-10-14 08:54:25 UTC (rev 1563)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2008-10-14 09:01:24 UTC (rev 1564)
@@ -44,7 +44,9 @@
 import static org.codelutin.i18n.I18nf._;
 import fr.ifremer.isisfish.IsisFish;
 import fr.ifremer.isisfish.IsisFishException;
+import fr.ifremer.isisfish.datastore.ExportStorage;
 import fr.ifremer.isisfish.datastore.RegionStorage;
+import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.datastore.RuleStorage;
 import fr.ifremer.isisfish.datastore.ScriptStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -273,49 +275,67 @@
                 SimulationService.getService().submit(simulId, p, launcher, =
0);
             }
     }
-    public void addTagValue(String tag, String value){
-        param.getTagValue().put(tag, value);
-    }
-    public void removeTagValue(String tag){
-        log.debug("removeTagValue: " + tag);
-        param.getTagValue().remove(tag);
-    }
-    public void saveTagValue(Map<String, String> tagValues){
-        log.debug("call saveTagValue: " + tagValues);
-        IsisFish.config.setDefaultTagValues(tagValues);
-    }
     public List<SimulatorLauncher> getSimulationLauncher(){
         return SimulationService.getService().getSimulationLaunchers();
     }
     public List<Strategy> getStrategies(){
         List<Strategy> result =3D new ArrayList<Strategy>();
         try {
-            result =3D regionStorage.getFisheryRegion(param.getRegion().getS=
torage()).getStrategy();
-        } catch (StorageException ex) {
+            result =3D RegionStorage.getFisheryRegion(param.getRegion().getS=
torage().beginTransaction()).getStrategy();
+        } catch (Exception ex) {
             Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
         }
-//         result =3D param.getStrategies();
         return result;
     }
     public List<Population> getPopulations(){
         List<Species> species;
         List<Population> result =3D new ArrayList<Population>();
         try {
-            species =3D regionStorage.getFisheryRegion(param.getRegion().get=
Storage()).getSpecies();
+            species =3D RegionStorage.getFisheryRegion(param.getRegion().get=
Storage().beginTransaction()).getSpecies();
             for (Species s : species){
                 result.addAll(s.getPopulation());
             }
         } catch (Exception ex) {
             Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, =
null, ex);
         }
-//        result =3D param.getPopulations();
         return result;
     }
     public void setNbAnnees(String years){
         param.setNumberOfYear(Integer.parseInt(years));
     }
-   =20
-    static public List<String> getSimulatorNames(){
+    public List<String> getSimulatorNames(){
         return SimulatorStorage.getSimulatorNames();
     }
+    public void addTagValue(String tag, String value){
+        param.getTagValue().put(tag, value);
+    }
+    public void removeTagValue(String tag){
+        log.debug("removeTagValue: " + tag);
+        param.getTagValue().remove(tag);
+    }
+    public void saveTagValue(String simulatorName){
+        Map<String, String> tagValues =3D param.getTagValue();
+        log.debug("call saveTagValue: " + tagValues);
+        IsisFish.config.setDefaultTagValues(tagValues);
+       =20
+        IsisFish.config.setSimulatorClassfile(simulatorName);
+        //IsisFish.config.setSimulatorLauncher(local?"local":"isis-server");
+    }
+    public List<String> getExportNames(){
+        return ExportStorage.getExportNames();
+    }
+    public void updateDirectory(){
+         param.setExportDirectory(org.codelutin.util.FileUtil.getDirectory()=
);
+    }
+    public void saveExport(){
+        IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()=
);
+        IsisFish.config.setDefaultExportNames(param.getExportNames());
+    }
+    public void saveResultNames(Object[] resultNames) {
+        List<String> resultNamesString =3D new ArrayList<String>();
+        for (Object o : resultNames){
+            resultNamesString.add(o.toString());
+        }
+        IsisFish.config.setDefaultResultNames(resultNamesString);
+    }
 }


--===============4436440300161137642==--