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

18 Sep 2009

Author: chatellier
Date: 2009-09-18 09:10:41 +0000 (Fri, 18 Sep 2009)
New Revision: 2634

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.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/InputAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.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/SimulAction.java
Log:
Conservation de la selection lors du rechargement des simulations.

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java	2009-09-18 09:10:41 UTC (rev 2634)
@@ -830,7 +830,7 @@
         }
         setParameter(parameter);
         
-        this methods sometime force save of emmtyu parameters
+        this methods sometime force save of empty parameters
     }*/
 
     /*

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -23,15 +23,8 @@
         public void setContent(Container c) {
             this.add(c, BorderLayout.CENTER);
         }
-        
+
         /**
-         * @deprecated use setStatusMessage(String) instead
-         */
-        public void setInfoText(String message) {
-           setStatusMessage(message);
-        }
-        
-        /**
          * Change status message and stop progress bar if running.
          *
          * @param message new message

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -30,7 +30,6 @@
 import com.bbn.openmap.gui.OMToolSet;
 import com.bbn.openmap.event.SelectMouseMode;
 import fr.ifremer.isisfish.map.CellSelectionLayer;
-import fr.ifremer.isisfish.map.CellSelectionLayer;
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI;
 
 protected OMToolSet toolSet = new OMToolSet();

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	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -25,7 +25,6 @@
     <script><![CDATA[
 import java.util.ArrayList;
 import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.EffortDescriptionImpl;
 import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
 import fr.ifremer.isisfish.entities.SetOfVessels;
 import fr.ifremer.isisfish.entities.Metier;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java	2009-09-18 09:10:41 UTC (rev 2634)
@@ -205,9 +205,8 @@
         } catch (Exception e) {
             String msg = _("isisfish.error.no.select.simulation");
             if (log.isWarnEnabled()) {
-                log.warn(msg);
+                log.warn(msg, e);
             }
-            e.printStackTrace();
             showMsgBox(e);
             return null;
         }

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-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -98,7 +98,7 @@
 public void setInfoText(String msg) {
     WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
     if (root != null){
-        root.setInfoText(msg);
+        root.setStatusMessage(msg);
     }
 }
 protected void goTo() {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -148,7 +148,7 @@
 }
 protected void setInfoText(String s) {
     WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
-    root.setInfoText(s);
+    root.setStatusMessage(s);
 }
 protected void regionNull() {
     getCardlayoutPrincipal().show(inputPanePrincipal,"none");

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	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -86,7 +86,7 @@
     protected void setInfoText(String txt) {
         // TODO remove getParentContainer use
         WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
-        root.setInfoText(txt);
+        root.setStatusMessage(txt);
     }
     ]]>
     </script>

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-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -38,7 +38,6 @@
 import fr.ifremer.isisfish.ui.WelcomeTabUI;
 import fr.ifremer.isisfish.ui.models.rule.RuleComboModel;
 import fr.ifremer.isisfish.ui.models.rule.RuleComboRenderer;
-import fr.ifremer.isisfish.ui.models.rule.RuleListCellRenderer;
 import fr.ifremer.isisfish.ui.models.rule.RuleListModel;
 import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel;
 import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor;
@@ -109,14 +108,14 @@
         log.debug(" selected " + selected);
     }
     if(selected != null && !selected.trim().isEmpty()) {
-        getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.region"));
+        getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.region"));
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
                 simulAction.regionChange(selected);
                 refresh();
-                setFactorRegion();
-                getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded"));
+                setSensitivityTabRegion();
+                getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.region.loaded"));
             }
         });
     }
@@ -134,7 +133,7 @@
         getParentContainer(SimulUI.class).getSensUI().refresh();
     }
 }
-protected void setFactorRegion() {
+protected void setSensitivityTabRegion() {
     if (isSensitivity()) {
         try {
             // FIXME this transation in nerver closed
@@ -175,22 +174,22 @@
     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"));
+        getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.loading.old.simulation"));
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
                 simulAction.loadOldSimulation(selected);
-                refresh();
+                //refresh();
                 fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName());
                 // mise a jour des années
                 fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear()));
                 setPreScript();
                 setAnalysePlan();
-                setFactorRegion();
+                //setFactorRegion();
                 setExportSens();
                 setSensitivityCalculator();
                 setFactor();
-                getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.old.simulation.loaded"));
+                getParentContainer(WelcomePanelUI.class).setStatusMessage(_("isisfish.message.old.simulation.loaded"));
             }
         });
     }
@@ -238,10 +237,10 @@
         simulAction.getSimulationParameter().setOnlyExport(false);
     }
 }
-protected void setNbAnnees(){
+protected void setNbAnnees() {
     simulAction.setNumberOfYear(fieldSimulParamsNbAnnees.getText());
 }
-protected void setListSimulParamsStrategiesItems(){
+protected void setListSimulParamsStrategiesItems() {
     DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel();
     java.util.List<Strategy> strategies = simulAction.getStrategies();
     for (Strategy s : strategies){
@@ -249,14 +248,12 @@
     }
     listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel);
     java.util.List<Strategy> strategiesSelected = simulAction.getSimulationParameter().getStrategies();
-    if (listSimulParamsStrategiesModel.size() != 0){
-        int[] indexs = new int[listSimulParamsStrategiesModel.size()];
-        int i = 0;
+    if (listSimulParamsStrategiesModel.size() != 0) {
         for (Strategy s : strategiesSelected){
-            indexs[i] = listSimulParamsStrategiesModel.indexOf(s);
-            i++;
+            int index = listSimulParamsStrategiesModel.indexOf(s);
+            listSimulParamsStrategies.addSelectionInterval(index, index);
         }
-        listSimulParamsStrategies.setSelectedIndices(indexs);
+        
         strategySelected();
     }
 }
@@ -268,14 +265,11 @@
     }
     listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel);
     java.util.List<Population> populationsSelected = simulAction.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++;
+    if (listSimulParamsPopulationsModel.size() != 0) {
+        for (Population p : populationsSelected) {
+            int index = listSimulParamsPopulationsModel.indexOf(p);
+            listSimulParamsPopulations.addSelectionInterval(index, index);
         }
-        listSimulParamsPopulations.setSelectedIndices(indexs);
         populationSelected();
     }
 }

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	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2009-09-18 09:10:41 UTC (rev 2634)
@@ -55,13 +55,13 @@
   
     protected void saveConfigResultNames() {
         getContextValue(SimulAction.class).saveConfigurationResultNames(listResultNames.getSelectedValues());
-        setInfoText(_("isisfish.resultChoice.saved"));
+        setStatusMessage(_("isisfish.resultChoice.saved"));
     }
 
-    protected void setInfoText(String txt) {
+    protected void setStatusMessage(String txt) {
         // TODO remove getParentContainer use
         WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
-        root.setInfoText(txt);
+        root.setStatusMessage(txt);
     }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2009-09-18 09:07:37 UTC (rev 2633)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2009-09-18 09:10:41 UTC (rev 2634)
@@ -236,7 +236,7 @@
         List<String> result = new ArrayList<String>();
         try {
             ScriptStorage storage = ScriptStorage.getScript("ResultName.java");
-            Class resultNameClass = storage.getCodeClass();
+            Class<?> resultNameClass = storage.getCodeClass();
             // TODO: if we can't find class, perhaps try to parser Java source ?
             Field[] fields = resultNameClass.getFields();
             for (Field f : fields) {
@@ -279,7 +279,7 @@
     }
 
     /**
-     * Change region in simulation launcher
+     * Load old simulation.
      *
      * @param simulName name of simulation to load
      */
@@ -303,7 +303,7 @@
             }*/
 
             // Chargement des facteurs
-            File f = simulStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName));
+            File f = SimulationStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName));
             if (f != null && f.canRead()) {
                 if (log.isInfoEnabled()) {
                     log.info("Import design plan from : " + f.getAbsolutePath());
@@ -851,8 +851,9 @@
         f.setDomain(domain);
         f.setComment(comment);
         f.setPath(path);
-        if (exist)
+        if (exist) {
             removeFactor(f);
+        }
         addFactor(f, c);
     }

    

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

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)