r259 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n - Coser-commits

24 Nov 2010

Author: chatellier
Date: 2010-11-24 10:50:56 +0000 (Wed, 24 Nov 2010)
New Revision: 259

Log:
Ajout d'erreur plus parlante pour les fichiers reftax et codetypeespeces manquant

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java
   trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
   trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java
===================================================================

--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2010-11-24 10:31:58 UTC (rev 258)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2010-11-24 10:50:56 UTC (rev 259)
@@ -46,9 +46,11 @@
 import jaxx.runtime.swing.editor.config.ConfigUI;
 import jaxx.runtime.swing.editor.config.ConfigUIHelper;
 
+import org.apache.commons.lang.xwork.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.i18n.I18n;
+import org.nuiton.util.StringUtil;
 import org.nuiton.widget.SwingSession;
 
 import fr.ifremer.coser.CoserBusinessConfig;
@@ -219,7 +221,7 @@
     public void createProject(final ProjectCreationView projectView) {
         CoserConfig config = projectView.getContextValue(CoserConfig.class);
         final Project project = projectView.getProject();
-        
+
         // get correct reftax to use depending on project configuration
         String reftaxSpeciesPath = null;
         if (projectView.getCustomReferenceCheckBox().isSelected()) {
@@ -231,7 +233,7 @@
 
         // get correct codeTypeEspece file to use
         String codeTypeEspecePath = config.getReferenceTypeEspecesPath();
-        
+
         // convert to file
         File capturesFile = new File(project.getCatchFile());
         File stratesFile = new File(project.getStrataFile());
@@ -240,6 +242,18 @@
         File reftaxSpeciesFile = new File(reftaxSpeciesPath);
         File codeTypeEspeceFile = new File(codeTypeEspecePath);
 
+        // check some files existences
+        if (!reftaxSpeciesFile.canRead()) {
+            JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingReftax"),
+                    _("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        if (!codeTypeEspeceFile.canRead()) {
+            JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingCodeTypeEspeces"),
+                    _("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
         // package in map
         final Map<Category, File> fileToLoad = new HashMap<Category, File>();
         fileToLoad.put(Category.CATCH, capturesFile);

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties
===================================================================
--- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2010-11-24 10:31:58 UTC (rev 258)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2010-11-24 10:50:56 UTC (rev 259)
@@ -49,6 +49,7 @@
 coser.ui.control.validcontrol=
 coser.ui.control.validcontroltip=
 coser.ui.error.htmlmessage=An error occurs \: %s
+coser.ui.error.missingFile=
 coser.ui.error.title=Global application error
 coser.ui.graph.compareNumberCatchSize=
 coser.ui.graph.lengthStructure=
@@ -72,9 +73,12 @@
 coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi
 coser.ui.project.captureFile=Capture file \:
 coser.ui.project.createProject=Create project
+coser.ui.project.createProjectMissingCodeTypeEspeces=
+coser.ui.project.createProjectMissingReftax=
 coser.ui.project.creationError=Creation error
 coser.ui.project.customReferenceSpeciesFile=New reference file \:
 coser.ui.project.lengthFile=Length file \:
+coser.ui.project.missingFile=
 coser.ui.project.newProject=New project
 coser.ui.project.openError=Open error
 coser.ui.project.openProject=Open

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties
===================================================================
--- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2010-11-24 10:31:58 UTC (rev 258)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2010-11-24 10:50:56 UTC (rev 259)
@@ -72,9 +72,12 @@
 coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi
 coser.ui.project.captureFile=Fichier de captures \:
 coser.ui.project.createProject=Cr\u00E9er le projet
+coser.ui.project.createProjectMissingCodeTypeEspeces=Le fichier 'CodeTypeEspeces' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.typeEspeces)
+coser.ui.project.createProjectMissingReftax=Le fichier 'Reftax' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.species)
 coser.ui.project.creationError=Erreur de cr\u00E9ation
 coser.ui.project.customReferenceSpeciesFile=Nouveau fichier de r\u00E9f\u00E9rence \:
 coser.ui.project.lengthFile=Fichiers des tailles \:
+coser.ui.project.missingFile=Fichier manquant
 coser.ui.project.newProject=Nouveau projet
 coser.ui.project.openError=Erreur d'ouverture
 coser.ui.project.openProject=Ouvrir

    

r259 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)