[Fudaa-svn-commit] SF.net SVN: fudaa:[9471] trunk/business/fudaa-sig/src/main

[<de...@us...>]

Revision: 9471
          http://sourceforge.net/p/fudaa/svn/9471
Author:   deniger
Date:     2016-12-05 21:49:16 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
CRUE-654

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
    trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2016-12-01 09:24:50 UTC (rev 9470)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2016-12-05 21:49:16 UTC (rev 9471)
@@ -124,8 +124,6 @@
    */
   private int selectedTabInSingleObjectEditorPanel_ = 0;
 
-  
-
   /**
    * L'\xE9dition pour un objet selectionn\xE9 unique.
    *
@@ -272,7 +270,7 @@
     final BuFileFilter sx = SinusxFileFormat.getInstance().createFileFilter();
     final BuFileFilter st = RubarStCnFileFormat.createStFilter();
     final BuFileFilter gen = ZESRiFileFormat.getInstance().createFileFilter();
-    
+
     final Map filterExporter = new HashMap(5);// pour l'instant .....
 
     filterExporter.put(sx, new FSigLayerExporterI.ToSinusX());
@@ -300,6 +298,11 @@
     if (f == null) {
       return;
     }
+    final FSigLayerExporterI fileExporter = (FSigLayerExporterI) filterExporter.get(fileChooser.getFileFilter());
+    if (fileExporter == null) {
+      getPanel().getCtuluUI().error(FSigLib.getS("Le format d'export n'a pas \xE9t\xE9 trouv\xE9"));
+      return;
+    }
     CtuluDialogPanel pnExporterTranslate = new CtuluDialogPanel();
     pnExporterTranslate.setLayout(new BuGridLayout(2));
     BuTextField translateX = pnExporterTranslate.addLabelDoubleText(FudaaLib.getS("En X:"));
@@ -328,7 +331,7 @@
     new CtuluRunnable(FudaaLib.getS("Export") + ' ' + parent[0].getTitle(), getUi()) {
       @Override
       public boolean run(ProgressionInterface _proj) {
-        final CtuluIOOperationSynthese op = filter.exportTo((FSigLayerExporterI) filterExporter.get(fileChooser.getFileFilter()), getUi(), f,
+        final CtuluIOOperationSynthese op = filter.exportTo(fileExporter, getUi(), f,
                 translate, _proj);
         if (op != null) {
           getUi().manageErrorOperationAndIsFatal(op);

Modified: trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt
===================================================================
--- trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt	2016-12-01 09:24:50 UTC (rev 9470)
+++ trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt	2016-12-05 21:49:16 UTC (rev 9471)
@@ -185,4 +185,5 @@
 s\xE9lection des points=Points selection
 {0} calque(s) s\xE9lectionn\xE9(s)={0} selected layer(s)
 Hauteur\: {0} px=Height\: {0} px
-Largeur\: {0} px=Width\: {0} px
\ No newline at end of file
+Largeur\: {0} px=Width\: {0} px
+Le format d'export n'a pas \xE9t\xE9 trouv\xE9=Excport format not found
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.