r2441 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/simulator - Isis-fish-commits

29 Jun 2009

Author: chatellier
Date: 2009-06-29 16:53:08 +0000 (Mon, 29 Jun 2009)
New Revision: 2441

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
Log:
Remove a depracted function in region storage

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java	2009-06-29 16:52:24 UTC (rev 2440)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java	2009-06-29 16:53:08 UTC (rev 2441)
@@ -169,7 +169,7 @@
         }
     }
 
-    /**
+    /*
      * Retourne le nom courant de la région.
      * 
      * @return Le nom de la region
@@ -177,7 +177,7 @@
      * 
      * @deprecated ne plus utiliser car le context n'est jamais ferme, plutot
      * utiliser {@link #getFisheryRegion(TopiaContext)}
-     */
+     *
     public FisheryRegion getFisheryRegion() throws StorageException {
         try {
             TopiaContext tx = getStorage().beginTransaction();
@@ -187,7 +187,7 @@
         } catch (TopiaException eee) {
             throw new StorageException(_("isisfish.error.get.fisheryRegion"), eee);
         }
-    }
+    }*/
 
     public File getMapRepository() {
         File result = new File(getDirectory(), MAP_DIRECTORY);

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-06-29 16:52:24 UTC (rev 2440)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-06-29 16:53:08 UTC (rev 2441)
@@ -22,20 +22,19 @@
     <Boolean id='sensitivity' javaBean='false'/>
 
     <script><![CDATA[
+import org.codelutin.topia.TopiaException;
+import org.codelutin.topia.TopiaContext;
+import java.text.ParseException;
+import fr.ifremer.isisfish.datastore.RegionStorage;
+import fr.ifremer.isisfish.datastore.StorageException;
+import fr.ifremer.isisfish.entities.Population;
+import fr.ifremer.isisfish.entities.Strategy;
+import fr.ifremer.isisfish.entities.FisheryRegion;
+import fr.ifremer.isisfish.entities.FisheryRegionImpl;
 import fr.ifremer.isisfish.ui.Common;
 import fr.ifremer.isisfish.ui.WelcomePanelUI;
 import fr.ifremer.isisfish.ui.WelcomeTabUI;
 import fr.ifremer.isisfish.ui.RegionMonitor;
-import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.Population;
-import java.text.ParseException;
-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;
 import fr.ifremer.isisfish.ui.models.rule.RuleComboModel;
 import fr.ifremer.isisfish.ui.models.rule.RuleComboRenderer;
 import fr.ifremer.isisfish.ui.models.rule.RuleListCellRenderer;
@@ -43,7 +42,12 @@
 import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel;
 import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor;
 import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
 import fr.ifremer.isisfish.rule.Rule;
+import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
+import fr.ifremer.isisfish.simulator.launcher.SimulationService;
+import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
 
 // instances variables déclaration
 SimulationServiceListener simulationListener;
@@ -128,14 +132,21 @@
     }
 }
 protected void setFactorRegion() {
-    if (isSensitivity()){
+    if (isSensitivity()) {
         try {
-            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) simulAction.getSimulationParameter().getRegion().getFisheryRegion());
+            // FIXME this transation in nerver closed
+            TopiaContext tx = simulAction.getRegionStorage().getStorage().beginTransaction();
+            FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(tx);
+            getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) fisheryRegion);
             getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel();
         } catch (StorageException ex) {
             if (log.isErrorEnabled()) {
-                log.debug("Cant reload factors", ex);
+                log.error("Can't reload factors", ex);
             }
+        } catch (TopiaException ex) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't reload factors", ex);
+            }
         }
     }
 }

    

r2441 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/simulator

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)