[Isis-fish-commits] r2678 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

21 Oct 2009

Author: chatellier
Date: 2009-10-21 09:39:13 +0000 (Wed, 21 Oct 2009)
New Revision: 2678

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/InputUI.jaxx
Log:
Fix canceled copy action

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-10-21 09:25:45 UTC (rev 2677)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java	2009-10-21 09:39:13 UTC (rev 2678)
@@ -31,6 +31,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixFactory;
@@ -40,8 +41,6 @@
 import org.nuiton.util.FileUtil;
 import org.nuiton.widget.editor.Editor;
 
-import com.bbn.openmap.layer.shape.SpatialIndex;
-
 import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.datastore.FormuleStorage;
 import fr.ifremer.isisfish.datastore.RegionStorage;
@@ -134,7 +133,8 @@
                     _("isisfish.message.import.region.zipped"));
             if (file != null) {
 
-                String newName = JOptionPane.showInputDialog(_("isisfish.message.name.imported.region"));
+                String newName = JOptionPane
+                        .showInputDialog(_("isisfish.message.name.imported.region"));
                 RegionStorage.importAndRenameZip(file, newName);
             }
         } catch (Exception eee) {
@@ -180,8 +180,8 @@
         String simulationName;
         try {
             //TODO Should use a shared model ?
-            simulationName = SimulationFilterUtil.selectSimulation(SimulationStorage
-                    .getSimulationNames());
+            simulationName = SimulationFilterUtil
+                    .selectSimulation(SimulationStorage.getSimulationNames());
             if (simulationName == null) {
                 return null;
             }
@@ -191,7 +191,8 @@
             if (log.isWarnEnabled()) {
                 log.warn(msg, eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.no.select.simulation"), eee);
+            ErrorHelper.showErrorDialog(
+                    _("isisfish.error.no.select.simulation"), eee);
             return null;
         }
 
@@ -258,14 +259,16 @@
     /**
      * Copy la region avec un autre nom.
      *
+     * @param regionStorage region to copy
      * @return le nom de la nouvelle region
      */
     public String copyRegion(RegionStorage regionStorage) {
         String newName = null;
         try {
-            newName = JOptionPane.showInputDialog(_("isisfish.message.new.region.name"));
+            newName = JOptionPane
+                    .showInputDialog(_("isisfish.message.new.region.name"));
 
-            if (newName != null) {
+            if (!StringUtils.isEmpty(newName)) {
                 File zip = regionStorage.createZip();
                 RegionStorage.importAndRenameZip(zip, newName);
             }
@@ -355,7 +358,7 @@
         if (log.isDebugEnabled()) {
             log.debug("loadRegion : " + name);
         }
-        
+
         FisheryRegion region = null;
         try {
             RegionStorage regionStorage = null;
@@ -594,7 +597,8 @@
      */
     public Object saveAsModel(String category, String language, String content) {
         try {
-            String name = JOptionPane.showInputDialog(_("isisfish.message.saveModel.dialog"));
+            String name = JOptionPane
+                    .showInputDialog(_("isisfish.message.saveModel.dialog"));
             /*if ("".equals(name)) {
                 showMsgBox("Error " +_("isisfish.error.invalid.equation.name"));
             }*/
@@ -608,7 +612,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't save equation as model", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.equation.savemodel"),
+                    eee);
         }
         return null;
     }
@@ -630,7 +635,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't open editor", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.equation.openeditor"), eee);
+            ErrorHelper.showErrorDialog(
+                    _("isisfish.error.equation.openeditor"), eee);
         }
         return null;
     }
@@ -660,7 +666,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't add selectivity", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Selectivity"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "Selectivity"), eee);
         }
         return null;
     }
@@ -677,7 +684,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove TargetSpecies", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "Selectivity"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "Selectivity"), eee);
         }
         return null;
     }
@@ -726,17 +734,18 @@
     }*/
 
     public Object addTargetSpecies(Metier metier, MetierSeasonInfo m,
-            Species species, String targetFactorEquationContent, boolean primaryCatch) {
+            Species species, String targetFactorEquationContent,
+            boolean primaryCatch) {
         if (log.isDebugEnabled()) {
             log.debug("addTargetSpecies called: " + metier + " " + species
                     + " " + primaryCatch + " " + targetFactorEquationContent);
         }
         try {
             // build targetFactorEquation name
-            String targetFactorEquationName = metier.getName() + "-" + species.getName()
-                + "(" + m.getFirstMonth() + "-" + m.getLastMonth() + ")";
-            
-            
+            String targetFactorEquationName = metier.getName() + "-"
+                    + species.getName() + "(" + m.getFirstMonth() + "-"
+                    + m.getLastMonth() + ")";
+
             TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier
                     .getTopiaContext());
             TargetSpecies targetSpecies = dao.create();
@@ -752,7 +761,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't add TargetSpecies", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "TargetSpecies"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "TargetSpecies"), eee);
         }
         return null;
     }
@@ -770,7 +780,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove TargetSpecies", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "TargetSpecies"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "TargetSpecies"), eee);
         }
         return null;
     }
@@ -798,7 +809,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't create EffortDescription", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "EffortDescription"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "EffortDescription"), eee);
         }
     }
 
@@ -814,7 +826,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove entity: " + effort, eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "EffortDescription"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "EffortDescription"), eee);
         }
         return null;
     }
@@ -854,7 +867,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't create Population", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Population"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "Population"), eee);
         }
         return null;
     }
@@ -872,15 +886,16 @@
             seasonInfo.setLastMonth(Month.MONTH[3]);
             pop.addPopulationSeasonInfo(seasonInfo);
             seasonInfo.setPopulation(pop);
-            
+
             // EC-20090710 ajout du code d'initailisation
             // d'un populationseasoninfo
             // il a du se perdre au changement d'interface
             // swiat>jaxx
             seasonInfo.setSimpleLengthChangeMatrix(true);
-            MatrixND matrix = ((PopulationSeasonInfoImpl)seasonInfo).createNoSpacializedChangeGroupMatrix();
+            MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo)
+                    .createNoSpacializedChangeGroupMatrix();
             seasonInfo.setLengthChangeMatrix(matrix);
-            
+
             seasonInfo.update();
             pop.update();
             // isisContext.commitTransaction();
@@ -888,7 +903,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't create PopulationSeasonInfo", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "PopulationSeasonInfo"), eee);
         }
         return seasonInfo;
     }
@@ -906,7 +922,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove PopulationSeasonInfo", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "PopulationSeasonInfo"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "PopulationSeasonInfo"), eee);
         }
     }
 
@@ -928,7 +945,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't create MetierSeasonInfo", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "MetierSeasonInfo"), eee);
         }
     }
 
@@ -945,7 +963,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove MetierSeasonInfo", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "MetierSeasonInfo"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "MetierSeasonInfo"), eee);
         }
     }
 
@@ -986,7 +1005,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove RecruitmentDistribution", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity", "RecruitmentDistribution"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.removeentity",
+                    "RecruitmentDistribution"), eee);
         }
         return null;
     }
@@ -1007,7 +1027,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't add migration", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Migration"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "Migration"), eee);
         }
         return null;
     }
@@ -1026,7 +1047,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't add emigration", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Emigration"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "Emigration"), eee);
         }
         return null;
     }
@@ -1045,13 +1067,14 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't add immigration", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity", "Immigration"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.input.addentity",
+                    "Immigration"), eee);
         }
         return null;
     }
 
     // FisheryRegion
-    
+
     /**
      * Add new map in region.
      * 
@@ -1136,7 +1159,8 @@
             if (log.isErrorEnabled()) {
                 log.error("Can't remove map", eee);
             }
-            ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"), eee);
+            ErrorHelper.showErrorDialog(_("isisfish.error.region.removemap"),
+                    eee);
         }
     }
 

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	2009-10-21 09:25:45 UTC (rev 2677)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-10-21 09:39:13 UTC (rev 2678)
@@ -197,7 +197,9 @@
     setStatusMessage(_("isisfish.message.export.done"));
 }
 protected void copyRegion() {
-    setStatusMessage(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage())), true);
+    // TODO region name in not knwon before copy
+    setStatusMessage(_("isisfish.message.copy.region"), true);
+    getContextValue(InputAction.class).copyRegion(getRegionStorage());
     setStatusMessage(_("isisfish.message.copy.finished"));
 }
 protected void removeRegion() {

    

[Isis-fish-commits] r2678 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org