Bug 8595 fixed: The Options Dialogbox when exporting did not appear to front with several screen

Change-Id: I043802572dddb47bf540cb6ee1fa63f09eda6d71

12 files changed, 672 insertions, 633 deletions

diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 13e0cb1..337297a 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -273,6 +273,9 @@ Bug fixes:
 * bug 8423 fixed - With certain options of the configure, the build process
                    failed.
 
+* Bug 8595 fixed - The Options Dialogbox when exporting did not appear to front
+                   with several screens.
+
 * bug 8675 fixed - The complex function was undocumented.
 
 * bug 8959 fixed - winqueryreg returned an incorrect value if the value name was
diff --git a/scilab/modules/graphic_export/src/c/xs2file.c b/scilab/modules/graphic_export/src/c/xs2file.c
index e317873..e38e9aa 100644
--- a/scilab/modules/graphic_export/src/c/xs2file.c
+++ b/scilab/modules/graphic_export/src/c/xs2file.c
@@ -67,7 +67,7 @@ int xs2file(char * fname, ExportFileType fileType )
       int m1 = 0, n1 = 0, l1 = 0;
       int figurenum = -1;
       sciPointObj* figurePtr = NULL;
-      int status = 0;
+      char *status = NULL;
 
       /* get handle by figure number */
       if(GetType(1) == sci_matrix)
@@ -203,30 +203,11 @@ int xs2file(char * fname, ExportFileType fileType )
           freeArrayOfString(fileName,m1*n1);
 
           /* treat errors */
-          switch(status)
-            {
-            case EXPORT_UNKNOWN_GLEXCEPTION_ERROR :
-              Scierror(999,_("%s: OpenGL error during export.\n"),fname);
-              return 0;
-            case EXPORT_IOEXCEPTION_ERROR :
-              Scierror(999,_("%s: Unable to create export file, permission denied.\n"),fname);
-              return 0;
-            case EXPORT_INVALID_FILE :
-              Scierror(999,_("%s: Unable to create export file, invalid file.\n"),fname);
-              return 0;
-            case EXPORT_GL2PS_ERROR :
-              Scierror(999,_("%s: GL2PS error during export.\n"),fname);
+          if (strlen(status) != 0)
+          { 
+              Scierror(999,_("%s: %s\n"), fname, status);
               return 0;
-            case EXPORT_GL2PS_OVERFLOW :
-              Scierror(999,_("%s: Unable to create export file, figure is too big.\n"),fname);
-              return 0;
-            case EXPORT_GL2PS_UNINITIALIZED :
-              Scierror(999,_("%s: GL2PS error during export.\n"),fname);
-              return 0;
-            default :
-              // NO ERROR
-              break;
-            }
+          }
         }
       else
         {
diff --git a/scilab/modules/graphic_export/src/cpp/exportToFile.cpp b/scilab/modules/graphic_export/src/cpp/exportToFile.cpp
index 834fd0a..7a0164d 100644
--- a/scilab/modules/graphic_export/src/cpp/exportToFile.cpp
+++ b/scilab/modules/graphic_export/src/cpp/exportToFile.cpp
@@ -24,11 +24,11 @@ extern "C"
 
 
 /*---------------------------------------------------------------------------------*/
-int exportToFile(sciPointObj * pFigure,
-                 const char * fileName,
-                 ExportFileType fileType,
-                 const float jpegCompressionQuality,
-                 ExportOrientation orientation)
+char * exportToFile(sciPointObj * pFigure,
+                    const char * fileName,
+                    ExportFileType fileType,
+                    const float jpegCompressionQuality,
+                    ExportOrientation orientation)
 {
   return org_scilab_modules_graphic_export::FileExporter::fileExport(getScilabJavaVM(),
                                                                      sciGetNum(pFigure),
diff --git a/scilab/modules/graphic_export/src/cpp/exportToFile.hxx b/scilab/modules/graphic_export/src/cpp/exportToFile.hxx
index c7207fc..fc3e240 100644
--- a/scilab/modules/graphic_export/src/cpp/exportToFile.hxx
+++ b/scilab/modules/graphic_export/src/cpp/exportToFile.hxx
@@ -52,11 +52,11 @@ typedef enum
   EXPORT_LANDSCAPE = 1
 } ExportOrientation;
 
-int exportToFile(sciPointObj * pFigure,
-                 const char * fileName,
-                 ExportFileType fileType,
-                 const float jpegCompressionQuality,
-                 ExportOrientation orientation);
+char * exportToFile(sciPointObj * pFigure,
+                    const char * fileName,
+                    ExportFileType fileType,
+                    const float jpegCompressionQuality,
+                    ExportOrientation orientation);
 
 #ifdef __cplusplus
 }
diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java
index 20aef46..89f6ae4 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java
@@ -59,7 +59,7 @@ public class ExportBitmap extends ExportToFile {
      */
     public ExportBitmap(String filename, int filetype, float jpegCompressionQuality) {
         super(filename, filetype);
-        this.jpegCompressionQuality = jpegCompressionQuality;
+        this.jpegCompressionQuality = jpegCompressionQuality;
     }
 
     /**
@@ -136,13 +136,13 @@ public class ExportBitmap extends ExportToFile {
             ImageUtil.flipImageVertically(dump);
         }
         try {
-            if (jpegCompressionQuality != -1) {
-                if (!writeJPEG(dump, jpegCompressionQuality, file)) {
-                    return ExportRenderer.IOEXCEPTION_ERROR;
-                }
-            } else {
-                ImageIO.write(dump, getFileExtension(), file);
-            }
+            if (jpegCompressionQuality != -1) {
+                if (!writeJPEG(dump, jpegCompressionQuality, file)) {
+                    return ExportRenderer.IOEXCEPTION_ERROR;
+                }
+            } else {
+                ImageIO.write(dump, getFileExtension(), file);
+            }
         } catch (IOException e) {
             return ExportRenderer.IOEXCEPTION_ERROR;
         }
@@ -165,20 +165,20 @@ public class ExportBitmap extends ExportToFile {
      * @param file the output file
      */
     private boolean writeJPEG(BufferedImage image, float compressionQuality, File file) throws IOException {
-        Iterator iter = ImageIO.getImageWritersByFormatName("jpeg");
-        ImageWriter writer;
-        if (iter.hasNext()) {
-             writer = (ImageWriter) iter.next();
-        } else {
-            return false;
-        }
-        ImageWriteParam param = writer.getDefaultWriteParam();
-        param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-        param.setCompressionQuality(compressionQuality);
-        FileImageOutputStream output = new FileImageOutputStream(file);
-        writer.setOutput(output);
-        writer.write(null, new IIOImage(image, null, null), param);
-        writer.dispose();
-        return true;
+        Iterator iter = ImageIO.getImageWritersByFormatName("jpeg");
+        ImageWriter writer;
+        if (iter.hasNext()) {
+            writer = (ImageWriter) iter.next();
+        } else {
+            return false;
+        }
+        ImageWriteParam param = writer.getDefaultWriteParam();
+        param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        param.setCompressionQuality(compressionQuality);
+        FileImageOutputStream output = new FileImageOutputStream(file);
+        writer.setOutput(output);
+        writer.write(null, new IIOImage(image, null, null), param);
+        writer.dispose();
+        return true;
     }
 }
diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java
index bca66fb..6bcd979 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java
@@ -1,11 +1,11 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2009 - DIGITEO - Sylvestre Koumar
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
@@ -14,6 +14,8 @@ package org.scilab.modules.graphic_export;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.media.opengl.GLEventListener;
 import com.sun.opengl.util.FileUtil;
@@ -25,193 +27,217 @@ import com.sun.opengl.util.FileUtil;
  */
 public abstract class ExportRenderer implements GLEventListener {
 
-        /** Code-number for the function statue */
-        public static final int SUCCESS = 0;
-        public static final int UNKNOWN_GLEXCEPTION_ERROR = 1;
-        public static final int IOEXCEPTION_ERROR = 2;
-        public static final int INVALID_FILE = 3;
-        public static final int GL2PS_ERROR = 4;
-        public static final int GL2PS_OVERFLOW = 5;
-        public static final int GL2PS_UNINITIALIZED = 6;
-        
-        /** Code-number for each bitmap format */
-        public static final int BMP_EXPORT = 1;
-        public static final int GIF_EXPORT = 2;
-        public static final int JPG_EXPORT = 3;
-        public static final int PNG_EXPORT = 4;
-        public static final int PPM_EXPORT = 5;
-
-        /** Code-number for each postscript format */
-        public static final int EPS_EXPORT = 6;
-        public static final int PDF_EXPORT = 7;
-        public static final int SVG_EXPORT = 8;
-        public static final int PS_EXPORT = 9;
-        
-        /** Orientation of the exported figure */
-        public static final int PORTRAIT = 0;
-        public static final int LANDSCAPE = 1;
-
-        /** File name & file type */
-        private static String fileName;
-        private static int fileType;
-        private static int fileOrientation;
-
-        /** File extension */
-        private static String fileExtension;
-
-        /** give the type of the error */
-        private static int errorNumber;
-
-        /**
-         * Constructor
-         * @param fileName name of the file
-         * @param fileType type of the file
-         * @param fileOrientation orientation of the file
-         */
-        protected ExportRenderer(String fileName, int fileType, int fileOrientation) {
-                this.fileName = fileName;
-                this.fileType = fileType;       
-                this.fileOrientation = fileOrientation;
-                this.fileExtension = "";
-                removeExtension();
-        }       
-
-        /**
-         * Choose which kind of filetype will be exported 
-         * @param figureIndex type of the file
-         * @param fileName name of the file
-         * @param fileType type of the file
-         * @param fileOrientation orientation of the file
-         * @return GL2PSRenderer export a postscript screen-shot
-         */
-        public static ExportRenderer createExporter(int figureIndex, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
-                
-                GL2PS gl2ps = new GL2PS();
-                
-                /** Select in which type the file will be exported */           
-                switch (fileType) {
-                case BMP_EXPORT:  
-                case GIF_EXPORT:
-                case JPG_EXPORT:
-                case PNG_EXPORT:
-                case PPM_EXPORT:
-                        return new BitmapRenderer(fileName, fileType, jpegCompressionQuality, fileOrientation);
-                case EPS_EXPORT:
-                case PDF_EXPORT:
-                case SVG_EXPORT:
-                case PS_EXPORT:
-                        return new GL2PSRenderer(figureIndex, fileName, fileType, fileOrientation);
-                default: System.err.println(ExportRenderer.INVALID_FILE);
-                }
-                return null;                    
-        }
-
-        /**
-         * getter 
-         * @return fileName get the file name
-         */
-        public static String getFileName() {
-                return fileName;
-        }
-
-        /**
-         * setter 
-         * @param fileName set the file name
-         */
-        public void setFileName(String fileName) {
-                this.fileName = fileName;
-        }
-
-        /**
-         * getter
-         * @return fileType get the file type
-         */
-        public static int getFileType() {
-                return fileType;
-        }
-
-        /**
-         * setter 
-         * @param fileType set the file name
-         */
-        public void setFileType(int fileType) {
-                this.fileType = fileType;
-        }       
-
-        /**
-         * @return the fileOrientation
-         */
-        public static int getFileOrientation() {
-                return fileOrientation;
-        }
-
-        /**
-         * @param fileOrientation the fileOrientation to set
-         */
-        public static void setFileOrientation(int fileOrientation) {
-                ExportRenderer.fileOrientation = fileOrientation;
-        }
-
-        /**
-         * getter 
-         * @return the fileExtension
-         */
-        public static String getFileExtension() {
-                return fileExtension;
-        }
-
-        /**
-         * setter 
-         * @param fileExtension the fileExtension to set
-         */
-        public void setFileExtension(String fileExtension) {
-                this.fileExtension = fileExtension;
-        }
-
-        /**
-         * Function allowing to format the extension of the screen-shot file  
-         */
-        public void removeExtension() {         
-                String suffix = FileUtil.getFileSuffix(this.fileName); //get the suffix(extension) of the file name
-                int pos = this.fileName.lastIndexOf('.'); // position of the dot
-
-                if (suffix != null) {
-
-                        String[] extensionsAllowed = {"bmp", "gif", "jpg", "jpeg", "png", "ppm", "eps", "pdf", "svg", "ps"};
-
-                        Integer[] fileTypeAllowed = {ExportRenderer.BMP_EXPORT, ExportRenderer.GIF_EXPORT, 
-                                                                                 ExportRenderer.JPG_EXPORT, ExportRenderer.PNG_EXPORT, 
-                                                                                 ExportRenderer.PPM_EXPORT, ExportRenderer.EPS_EXPORT, 
-                                                                                 ExportRenderer.PDF_EXPORT, ExportRenderer.SVG_EXPORT, 
-                                                                                 ExportRenderer.PS_EXPORT};
-
-                        suffix = suffix.toLowerCase();
-
-                        /* Transform the array to vector to have access to search methods*/
-
-                        ArrayList<String> extensionsAllowedV = new ArrayList<String>(Arrays.asList(extensionsAllowed));
-                        ArrayList<Integer> fileTypeAllowedV = new ArrayList<Integer>(Arrays.asList(fileTypeAllowed));
-
-                        if (extensionsAllowedV.contains(suffix) && fileTypeAllowedV.contains(this.fileType)){
-                                this.fileName = this.fileName.substring(0, pos); /* Physically removed the extension */
-                                this.fileExtension = suffix; /* Store the extension... we want the same as used initially (ex: jpeg) */
-                        } 
-                }
-        }
-
-        /**
-         * get the number of the error
-         * @return errorNumber the number of the error
-         */
-        public static int getErrorNumber() {
-                return errorNumber;
-        }
-
-        /**
-         * set the number of the error
-         * @param errorNumber the number of the error
-         */
-        public static void setErrorNumber(int errorNumber) {
-                ExportRenderer.errorNumber = errorNumber;
-        }
+    /** Code-number for the function statue */
+    public static final int SUCCESS = 0;
+    public static final int UNKNOWN_GLEXCEPTION_ERROR = 1;
+    public static final int IOEXCEPTION_ERROR = 2;
+    public static final int INVALID_FILE = 3;
+    public static final int GL2PS_ERROR = 4;
+    public static final int GL2PS_OVERFLOW = 5;
+    public static final int GL2PS_UNINITIALIZED = 6;
+
+    public static final Map<Integer, String> errors = new HashMap<Integer, String>();
+    static {
+        errors.put(ExportRenderer.SUCCESS, "");
+        errors.put(ExportRenderer.UNKNOWN_GLEXCEPTION_ERROR, "OpenGL error during export.");
+        errors.put(ExportRenderer.IOEXCEPTION_ERROR, "Unable to create export file, permission denied.");
+        errors.put(ExportRenderer.INVALID_FILE, "Unable to create export file, invalid file.");
+        errors.put(ExportRenderer.GL2PS_ERROR, "GL2PS error during export.");
+        errors.put(ExportRenderer.GL2PS_OVERFLOW, "Unable to create export file, figure is too big.");
+        errors.put(ExportRenderer.GL2PS_UNINITIALIZED, "GL2PS error during export.");
+    }
+
+    /** Code-number for each bitmap format */
+    public static final int BMP_EXPORT = 1;
+    public static final int GIF_EXPORT = 2;
+    public static final int JPG_EXPORT = 3;
+    public static final int PNG_EXPORT = 4;
+    public static final int PPM_EXPORT = 5;
+
+    /** Code-number for each postscript format */
+    public static final int EPS_EXPORT = 6;
+    public static final int PDF_EXPORT = 7;
+    public static final int SVG_EXPORT = 8;
+    public static final int PS_EXPORT = 9;
+
+    public static final Map<String, Integer> types = new HashMap<String, Integer>();
+    static {
+        types.put("bmp", BMP_EXPORT);
+        types.put("gif", GIF_EXPORT);
+        types.put("jpg", JPG_EXPORT);
+        types.put("png", PNG_EXPORT);
+        types.put("ppm", PPM_EXPORT);
+        types.put("eps", EPS_EXPORT);
+        types.put("pdf", PDF_EXPORT);
+        types.put("svg", SVG_EXPORT);
+        types.put("ps", PS_EXPORT);
+    }
+
+    /** Orientation of the exported figure */
+    public static final int PORTRAIT = 0;
+    public static final int LANDSCAPE = 1;
+
+    /** File name & file type */
+    private static String fileName;
+    private static int fileType;
+    private static int fileOrientation;
+
+    /** File extension */
+    private static String fileExtension;
+
+    /** give the type of the error */
+    private static int errorNumber;
+
+    /**
+     * Constructor
+     * @param fileName name of the file
+     * @param fileType type of the file
+     * @param fileOrientation orientation of the file
+     */
+    protected ExportRenderer(String fileName, int fileType, int fileOrientation) {
+        this.fileName = fileName;
+        this.fileType = fileType;
+        this.fileOrientation = fileOrientation;
+        this.fileExtension = "";
+        removeExtension();
+    }
+
+    /**
+     * Choose which kind of filetype will be exported
+     * @param figureIndex type of the file
+     * @param fileName name of the file
+     * @param fileType type of the file
+     * @param fileOrientation orientation of the file
+     * @return GL2PSRenderer export a postscript screen-shot
+     */
+    public static ExportRenderer createExporter(int figureIndex, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
+
+        GL2PS gl2ps = new GL2PS();
+
+        /** Select in which type the file will be exported */
+        switch (fileType) {
+        case BMP_EXPORT:
+        case GIF_EXPORT:
+        case JPG_EXPORT:
+        case PNG_EXPORT:
+        case PPM_EXPORT:
+            return new BitmapRenderer(fileName, fileType, jpegCompressionQuality, fileOrientation);
+        case EPS_EXPORT:
+        case PDF_EXPORT:
+        case SVG_EXPORT:
+        case PS_EXPORT:
+            return new GL2PSRenderer(figureIndex, fileName, fileType, fileOrientation);
+        default: System.err.println(ExportRenderer.INVALID_FILE);
+        }
+        return null;
+    }
+
+    /**
+     * getter
+     * @return fileName get the file name
+     */
+    public static String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * setter
+     * @param fileName set the file name
+     */
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    /**
+     * getter
+     * @return fileType get the file type
+     */
+    public static int getFileType() {
+        return fileType;
+    }
+
+    /**
+     * setter
+     * @param fileType set the file name
+     */
+    public void setFileType(int fileType) {
+        this.fileType = fileType;
+    }
+
+    /**
+     * @return the fileOrientation
+     */
+    public static int getFileOrientation() {
+        return fileOrientation;
+    }
+
+    /**
+     * @param fileOrientation the fileOrientation to set
+     */
+    public static void setFileOrientation(int fileOrientation) {
+        ExportRenderer.fileOrientation = fileOrientation;
+    }
+
+    /**
+     * getter
+     * @return the fileExtension
+     */
+    public static String getFileExtension() {
+        return fileExtension;
+    }
+
+    /**
+     * setter
+     * @param fileExtension the fileExtension to set
+     */
+    public void setFileExtension(String fileExtension) {
+        this.fileExtension = fileExtension;
+    }
+
+    /**
+     * Function allowing to format the extension of the screen-shot file
+     */
+    public void removeExtension() {
+        String suffix = FileUtil.getFileSuffix(this.fileName); //get the suffix(extension) of the file name
+        int pos = this.fileName.lastIndexOf('.'); // position of the dot
+
+        if (suffix != null) {
+
+            String[] extensionsAllowed = {"bmp", "gif", "jpg", "jpeg", "png", "ppm", "eps", "pdf", "svg", "ps"};
+
+            Integer[] fileTypeAllowed = {ExportRenderer.BMP_EXPORT, ExportRenderer.GIF_EXPORT,
+                                         ExportRenderer.JPG_EXPORT, ExportRenderer.PNG_EXPORT,
+                                         ExportRenderer.PPM_EXPORT, ExportRenderer.EPS_EXPORT,
+                                         ExportRenderer.PDF_EXPORT, ExportRenderer.SVG_EXPORT,
+                                         ExportRenderer.PS_EXPORT};
+
+            suffix = suffix.toLowerCase();
+
+            /* Transform the array to vector to have access to search methods*/
+
+            ArrayList<String> extensionsAllowedV = new ArrayList<String>(Arrays.asList(extensionsAllowed));
+            ArrayList<Integer> fileTypeAllowedV = new ArrayList<Integer>(Arrays.asList(fileTypeAllowed));
+
+            if (extensionsAllowedV.contains(suffix) && fileTypeAllowedV.contains(this.fileType)){
+                this.fileName = this.fileName.substring(0, pos); /* Physically removed the extension */
+                this.fileExtension = suffix; /* Store the extension... we want the same as used initially (ex: jpeg) */
+            }
+        }
+    }
+
+    /**
+     * get the number of the error
+     * @return errorNumber the number of the error
+     */
+    public static int getErrorNumber() {
+        return errorNumber;
+    }
+
+    /**
+     * set the number of the error
+     * @param errorNumber the number of the error
+     */
+    public static void setErrorNumber(int errorNumber) {
+        ExportRenderer.errorNumber = errorNumber;
+    }
 }
diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
index 980aa63..78889c6 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java
@@ -3,11 +3,11 @@
  * Copyright (C) 2007 - INRIA - Jean-Baptiste Silvy
  * Copyright (C) 2009 - Calixte Denizet
  * desc : Static class used to create file export of graphic figures
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
@@ -45,19 +45,20 @@ public class FileExporter {
      * @param figureIndex index of the figure to export
      * @param fileName name of the file to create
      * @param fileType kind of the file
+     * @param jpegCompressionQuality the JPEG compression quality
      * @param fileOrientation orientation of the file
      * @return 0 if everything worked fine, a non null integer if an exception occured
      *         depending on the kind of error
      */
-    public static int fileExport(int figureIndex, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
+    public static String fileExport(int figureIndex, String fileName, int fileType, float jpegCompressionQuality, int fileOrientation) {
         int saveFileType = -1;
         String saveFileName = "";
-    
+
         DrawableFigureGL exportedFig = FigureMapper.getCorrespondingFigure(figureIndex);
 
         if (exportedFig == null) {
             // figure no longer exists
-            return ExportRenderer.IOEXCEPTION_ERROR;
+            return ExportRenderer.errors.get(ExportRenderer.IOEXCEPTION_ERROR);
         }
 
         //When the graphic-export is too long, we inform the user that the figure is exporting
@@ -91,17 +92,17 @@ public class FileExporter {
             String ext = "";
 
             switch (fileType) {
-                case ExportRenderer.PDF_EXPORT:
-                    ext = ".pdf";
-                    break;
-                case ExportRenderer.EPS_EXPORT:
-                    ext = ".eps";
-                    break;
-                case ExportRenderer.PS_EXPORT:
-                    ext = ".ps";
-                    break;
-                default: /* Do not the extension. Probably an error */
-                    return ExportRenderer.IOEXCEPTION_ERROR;
+            case ExportRenderer.PDF_EXPORT:
+                ext = ".pdf";
+                break;
+            case ExportRenderer.EPS_EXPORT:
+                ext = ".eps";
+                break;
+            case ExportRenderer.PS_EXPORT:
+                ext = ".ps";
+                break;
+            default: /* Do not the extension. Probably an error */
+                return ExportRenderer.errors.get(ExportRenderer.IOEXCEPTION_ERROR);
             }
 
             String name = new File(fileName).getName();
@@ -117,7 +118,7 @@ public class FileExporter {
                 /* Temporary SVG file which will be used to convert to PDF */
                 /* fileName prefix must be at least 3 characters */
                 while (name.length() < 3) {
-                  name = "_" + name;
+                    name = "_" + name;
                 }
                 fileName = File.createTempFile(name,".svg").getAbsolutePath();
             } catch (IOException e) {
@@ -127,7 +128,7 @@ public class FileExporter {
             saveFileType = fileType;
             fileType = ExportRenderer.SVG_EXPORT;
         }
-    
+
         ExportRenderer export;
         export = ExportRenderer.createExporter(figureIndex, fileName, fileType, jpegCompressionQuality, fileOrientation);
 
@@ -146,6 +147,6 @@ public class FileExporter {
             new File(fileName).delete();
         }
 
-        return ExportRenderer.getErrorNumber();
+        return ExportRenderer.errors.get(ExportRenderer.getErrorNumber());
     }
 }
diff --git a/scilab/modules/graphic_export/src/jni/FileExporter.cpp b/scilab/modules/graphic_export/src/jni/FileExporter.cpp
index 39af3fd..97dc96f 100644
--- a/scilab/modules/graphic_export/src/jni/FileExporter.cpp
+++ b/scilab/modules/graphic_export/src/jni/FileExporter.cpp
@@ -104,7 +104,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
 curEnv->DeleteLocalRef(localInstance);
 
                 /* Methods ID set to NULL */
-jintfileExportjintjstringjintjfloatjintID=NULL; 
+jstringfileExportjintjstringjintjfloatjintID=NULL; 
 
 
 }
@@ -127,7 +127,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
 throw GiwsException::JniObjectCreationException(curEnv, this->className());
         }
         /* Methods ID set to NULL */
-        jintfileExportjintjstringjintjfloatjintID=NULL; 
+        jstringfileExportjintjstringjintjfloatjintID=NULL; 
 
 
 }
@@ -147,14 +147,14 @@ throw GiwsException::JniMonitorException(getCurrentEnv(), "FileExporter");
 }
 // Method(s)
 
-int FileExporter::fileExport (JavaVM * jvm_, int figureIndex, char * fileName, int fileType, float jpegCompressionQuality, int orientation){
+char * FileExporter::fileExport (JavaVM * jvm_, int figureIndex, char * fileName, int fileType, float jpegCompressionQuality, int orientation){
 
 JNIEnv * curEnv = NULL;
 jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 jclass cls = curEnv->FindClass( className().c_str() );
 
-jmethodID jintfileExportjintjstringjintjfloatjintID = curEnv->GetStaticMethodID(cls, "fileExport", "(ILjava/lang/String;IFI)I" ) ;
-if (jintfileExportjintjstringjintjfloatjintID == NULL) {
+jmethodID jstringfileExportjintjstringjintjfloatjintID = curEnv->GetStaticMethodID(cls, "fileExport", "(ILjava/lang/String;IFI)Ljava/lang/String;" ) ;
+if (jstringfileExportjintjstringjintjfloatjintID == NULL) {
 throw GiwsException::JniMethodNotFoundException(curEnv, "fileExport");
 }
 
@@ -165,13 +165,23 @@ throw GiwsException::JniBadAllocException(curEnv);
 }
 
 
-                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintfileExportjintjstringjintjfloatjintID ,figureIndex, fileName_, fileType, jpegCompressionQuality, orientation));
-                        curEnv->DeleteLocalRef(fileName_);
+                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringfileExportjintjstringjintjfloatjintID ,figureIndex, fileName_, fileType, jpegCompressionQuality, orientation));
+                        if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+const char *tempString = curEnv->GetStringUTFChars(res, 0);
+char * myStringBuffer = new char[strlen(tempString) + 1];
+strcpy(myStringBuffer, tempString);
+curEnv->ReleaseStringUTFChars(res, tempString);
+curEnv->DeleteLocalRef(res);
+curEnv->DeleteLocalRef(fileName_);
 curEnv->DeleteLocalRef(cls);
 if (curEnv->ExceptionCheck()) {
-throw GiwsException::JniCallMethodException(curEnv);
+delete[] myStringBuffer;
+                                throw GiwsException::JniCallMethodException(curEnv);
 }
-return res;
+return myStringBuffer;
 
 }
 
diff --git a/scilab/modules/graphic_export/src/jni/FileExporter.giws.xml b/scilab/modules/graphic_export/src/jni/FileExporter.giws.xml
index ad08169..d0a3b44 100644
--- a/scilab/modules/graphic_export/src/jni/FileExporter.giws.xml
+++ b/scilab/modules/graphic_export/src/jni/FileExporter.giws.xml
@@ -12,7 +12,7 @@
  
 <package name="org.scilab.modules.graphic_export">
   <object name="FileExporter">
-    <method name="fileExport" returnType="int" modifier="static">
+    <method name="fileExport" returnType="String" modifier="static">
       <parameter name="figureIndex" type="int"/>
       <parameter name="fileName" type="String"/>
       <parameter name="fileType" type="int"/>
diff --git a/scilab/modules/graphic_export/src/jni/FileExporter.hxx b/scilab/modules/graphic_export/src/jni/FileExporter.hxx
index 12f92a7..8bed854 100644
--- a/scilab/modules/graphic_export/src/jni/FileExporter.hxx
+++ b/scilab/modules/graphic_export/src/jni/FileExporter.hxx
@@ -64,7 +64,7 @@ private:
 JavaVM * jvm;
 
 protected:
-jmethodID jintfileExportjintjstringjintjfloatjintID; // cache method id
+jmethodID jstringfileExportjintjstringjintjfloatjintID; // cache method id
 
 
 
@@ -121,7 +121,7 @@ void synchronize();
 void endSynchronize();
 
 // Methods
-static int fileExport(JavaVM * jvm_, int figureIndex, char * fileName, int fileType, float jpegCompressionQuality, int orientation);
+static char * fileExport(JavaVM * jvm_, int figureIndex, char * fileName, int fileType, float jpegCompressionQuality, int orientation);
 
 
                         /**
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
index ee8bd7e..27e6373 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
@@ -1,18 +1,21 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Sylvestre Koumar
- * 
+ * Copyright (C) 2011 - Calixte DENIZET
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
 package org.scilab.modules.gui.bridge.filechooser;
 
 import java.awt.BorderLayout;
+import java.awt.Cursor;
 import java.awt.GridLayout;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
@@ -21,131 +24,140 @@ import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JFrame;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
+import org.scilab.modules.graphic_export.ExportRenderer;
+import org.scilab.modules.graphic_export.FileExporter;
+import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
+import org.scilab.modules.gui.messagebox.ScilabModalDialog;
+import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
+import org.scilab.modules.gui.tab.Tab;
 
 /**
- * Window in which we can configure option for the selected format 
+ * Window in which we can configure option for the selected format
  * @author Sylvestre Koumar
+ * @author Calixte DENIZET
  *
  */
-public class ExportOptionWindow extends JFrame implements ActionListener {
-        
-        private static final long serialVersionUID = 1L;
-        
-        private ExportData exportData;
-        private JFrame optionFrame;
+public class ExportOptionWindow extends JDialog implements ActionListener {
+
+    private static final long serialVersionUID = 1L;
+
+    private ExportData exportData;
+    private Window parentWindow;
+    private Tab parentTab;
+    private JDialog optionDialog;
     private JRadioButton portrait;
-    private JRadioButton landscape;    
+    private JRadioButton landscape;
     private JButton confirmOption;
     private JButton abortOption;
-        
-        
+
     /**
      * Default constructor
      * @param exportData information about the export
      */
-        public ExportOptionWindow(ExportData exportData) {
-                this.exportData = exportData;           
-        }
-
-        /**
-         * Display the option window
-         */
-        public void displayOptionWindow() {
-                optionFrame = new JFrame("Option for " + exportData.getExportExtension().toUpperCase() + " format");
-                optionFrame.setIconImage(new ImageIcon(System.getenv("SCI") + "/modules/gui/images/icons/scilab.png").getImage());
-                //Center the frame
-                optionFrame.setLocationRelativeTo(optionFrame.getParent());     
-                
-                optionFrame.setResizable(false);
-                optionFrame.setVisible(true);           
-        }       
-        
-        /**
-         * Selection between portrait or landscape option
-         */
-        public void landscapePortraitOption() {
-            
-            portrait = new JRadioButton("Portrait", true);
-            landscape = new JRadioButton("Landscape", false);
-
-            ButtonGroup bgroup = new ButtonGroup();
-            bgroup.add(portrait);
-            bgroup.add(landscape);
-            
-            confirmOption = new JButton("Confirm");
-            abortOption = new JButton("Abort");
-            
-
-            JPanel mainPanel = new JPanel();
-            BorderLayout layout = new BorderLayout();
-            mainPanel.setLayout(layout);
-            
-            JPanel center = new JPanel();
-            center.setLayout(new GridLayout(2, 1));
-            center.setBorder(BorderFactory.createTitledBorder(
-                       BorderFactory.createEtchedBorder(), " Orientation "));
-            
-            center.add(portrait);
-            center.add(landscape);
-            
-            JPanel south = new JPanel();
-            
-            south.add(confirmOption);
-            south.add(abortOption);
-            
-            mainPanel.add(center, BorderLayout.CENTER);
-            mainPanel.add(south, BorderLayout.EAST);
-            
-            optionFrame.add(mainPanel);     
-            optionFrame.pack();
-            
-            portrait.addActionListener(this);
-            landscape.addActionListener(this);
-            confirmOption.addActionListener(this);
-            abortOption.addActionListener(this);
-
-        }
-        
-        /**
-         * Action manager 
-         * @param evt ActionEvent
-         */
+    public ExportOptionWindow(ExportData exportData) {
+        this.exportData = exportData;
+    }
+
+    /**
+     * Display the option window
+     */
+    public void displayOptionWindow(Tab tab) {
+        parentTab = tab;
+        parentWindow = (Window) SwingUtilities.getAncestorOfClass(Window.class, (JComponent) tab.getAsSimpleTab());
+        optionDialog = new JDialog(parentWindow);
+        optionDialog.setTitle("Option for " + exportData.getExportExtension().toUpperCase() + " format");
+        optionDialog.setIconImage(new ImageIcon(System.getenv("SCI") + "/modules/gui/images/icons/scilab.png").getImage());
+        //Center the frame
+        optionDialog.setLocationRelativeTo(parentWindow);
+    }
+
+    /**
+     * Selection between portrait or landscape option
+     */
+    public void landscapePortraitOption() {
+        portrait = new JRadioButton("Portrait", true);
+        landscape = new JRadioButton("Landscape", false);
+
+        ButtonGroup bgroup = new ButtonGroup();
+        bgroup.add(portrait);
+        bgroup.add(landscape);
+
+        confirmOption = new JButton("Confirm");
+        abortOption = new JButton("Abort");
+
+
+        JPanel mainPanel = new JPanel();
+        BorderLayout layout = new BorderLayout();
+        mainPanel.setLayout(layout);
+
+        JPanel center = new JPanel();
+        center.setLayout(new GridLayout(2, 1));
+        center.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), " Orientation "));
+
+        center.add(portrait);
+        center.add(landscape);
+
+        JPanel south = new JPanel();
+
+        south.add(confirmOption);
+        south.add(abortOption);
+
+        mainPanel.add(center, BorderLayout.CENTER);
+        mainPanel.add(south, BorderLayout.EAST);
+
+        optionDialog.add(mainPanel);
+        optionDialog.pack();
+
+        portrait.addActionListener(this);
+        landscape.addActionListener(this);
+        confirmOption.addActionListener(this);
+        abortOption.addActionListener(this);
+
+        optionDialog.setModal(true);
+        optionDialog.setResizable(false);
+        optionDialog.setVisible(true);
+    }
+
+    /**
+     * Action manager
+     * @param evt ActionEvent
+     */
     public void actionPerformed(ActionEvent evt) {
-        
-        boolean b = portrait.isSelected();      
-        Vector<String> properties = new Vector<String>();
-        
-        
-        if (evt.getSource() == confirmOption) {
-                if (b) {
-                        properties.add(portrait.getText().toLowerCase());
-                } else {
-                        properties.add(landscape.getText().toLowerCase());
-                }  
-                        exportData.setExportProperties(properties);
-                        optionFrame.dispose();
-                        
-                        
-                        //now we manage only one option (portrait/landscape)
-                        //later we will have to manage more options (Vector<String> properties)
-                        String exportcmd = "xs2" + exportData.getExportExtension()
-                                                           + "(" + exportData.getFigureId() + ", '" + exportData.getExportName()
-                                                           + "', '" + exportData.getExportProperties().elementAt(0) + "');";
-                        
-                        InterpreterManagement.putCommandInScilabQueue(exportcmd);
-                }
-        
-        if (evt.getSource() == abortOption) {
-                optionFrame.dispose();
-        }
-        
-        
+        boolean b = portrait.isSelected();
+        Vector<String> properties = new Vector<String>();
+
+        if (evt.getSource() == confirmOption) {
+            if (b) {
+                properties.add(portrait.getText().toLowerCase());
+            } else {
+                properties.add(landscape.getText().toLowerCase());
+            }
+            exportData.setExportProperties(properties);
+            optionDialog.dispose();
+
+            int figId = exportData.getFigureId();
+            String fileName = exportData.getExportName();
+            int fileType = ExportRenderer.types.get(exportData.getExportExtension());
+            int orientation = exportData.getExportProperties().elementAt(0).equalsIgnoreCase("landscape") ? ExportRenderer.LANDSCAPE : ExportRenderer.PORTRAIT;
+
+            parentWindow.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            String err = FileExporter.fileExport(figId, fileName, fileType, 1f, orientation);// 1f is the jpeg quality compression and it is useless here
+            parentWindow.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+
+            if (err.length() != 0) {
+                ScilabModalDialog.show(parentTab, "An error occurred during export: " + err, "Export error", IconType.ERROR_ICON);
+            }
+        }
+
+        if (evt.getSource() == abortOption) {
+            optionDialog.dispose();
+        }
     }
-        
-        
 }
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java
index 5f79d9f..9effc04 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java
@@ -1,30 +1,38 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Sylvestre Koumar
- * 
+ * Copyright (C) 2011 - Calixte DENIZET
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
 package org.scilab.modules.gui.bridge.filechooser;
 
+import java.awt.Component;
+import java.awt.Window;
 import java.io.File;
 import java.util.ArrayList;
 
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
+import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import javax.swing.border.TitledBorder;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
+import org.scilab.modules.gui.graphicWindow.ScilabRendererProperties;
+import org.scilab.modules.gui.tab.Tab;
 import org.scilab.modules.gui.utils.ConfigManager;
 import org.scilab.modules.localization.Messages;
+import org.scilab.modules.renderer.FigureMapper;
 
 /**
  * This is the son of the usual Scilab file chooser,
@@ -33,251 +41,249 @@ import org.scilab.modules.localization.Messages;
  *
  */
 public class SwingScilabExportFileChooser extends SwingScilabFileChooser {
-        
-        private static final int NB_FILE_MASKS = 12;
-        
-        private final String bmpDesc = Messages.gettext("Windows BMP image");
-        private final String gifDesc = Messages.gettext("GIF image");
-        private final String jpgDesc = Messages.gettext("JPEG image");
-        private final String pngDesc = Messages.gettext("PNG image");
-        private final String ppmDesc = Messages.gettext("PPM image");
-        private final String emfDesc = Messages.gettext("Enhanced Metafile image (EMF)");
-        private final String epsDesc = Messages.gettext("Encapsulated PostScript image (EPS)");
-        private final String figDesc = Messages.gettext("FIG image");
-        private final String pdfDesc = Messages.gettext("PDF image");
-        private final String svgDesc = Messages.gettext("SVG image");
-        private final String allFilesDesc = Messages.gettext("All files");
-        
-        private final String bmp = "bmp";
-        private final String gif = "gif";
-        private final String[] jpg = {"jpg", "jpeg"};
-        private final String png = "png";
-        private final String ppm = "ppm";
-        private final String emf = "emf";
-        private final String eps = "eps";
-        private final String fig = "fig";
-        private final String pdf = "pdf";
-        private final String svg = "svg";
-        private final String allFiles = "*";
-        
-        private String exportName;      
-        private String extensionSelected;
-        private int figureId;
-        
-        /**
-         * Default constructor
-         * @param figureId id of the exported figure
-         */
-        public SwingScilabExportFileChooser(int figureId) {
-                super();
-                this.figureId = figureId;
-                exportCustomFileChooser(figureId);
-        }
-        
-        /**
-         * We customize the file chooser for the graphic export 
-         * by adding format selection
-         * @param figureId exported figure number
-         */
-        public void exportCustomFileChooser(int figureId) {             
-                ArrayList<FileMask> v = new ArrayList<FileMask>(NB_FILE_MASKS);  /* The order does matter */
-                v.add(new FileMask(bmp, bmpDesc));
-                v.add(new FileMask(gif, gifDesc));
-                v.add(new FileMask(jpg, jpgDesc));
-                v.add(new FileMask(png, pngDesc));
-                v.add(new FileMask(ppm, ppmDesc));
-                v.add(new FileMask(emf, emfDesc));
-                v.add(new FileMask(eps, epsDesc));
-                v.add(new FileMask(fig, figDesc));
-                v.add(new FileMask(pdf, pdfDesc));
-                v.add(new FileMask(svg, svgDesc));
-                v.add(new FileMask(allFiles, allFilesDesc)); // should always be at the last position
-
-                super.setDialogTitle(Messages.gettext("Export"));
-                super.setApproveButtonText(Messages.gettext("Export"));
-                File exportFile = new File(Messages.gettext("Untitled-export"));
-                super.setSelectedFile(exportFile);
-                super.setAcceptAllFileFilterUsed(false);                
-
-                this.figureId = figureId;
-                
-                for (int i = 0; i < v.size(); i++) {
-                        FileMask fm = (FileMask) v.get(i);
-                        if (i == v.size() - 1) { /* Last case ... all files, remove the extension */
-                                fm.clearExtensions();
-                        }
-                        super.addChoosableFileFilter(fm);
-                }
-
-        //Preview panel 
-                JPanel panelPreview = new JPanel();
-                
+
+    private static final int NB_FILE_MASKS = 12;
+
+    private final String bmpDesc = Messages.gettext("Windows BMP image");
+    private final String gifDesc = Messages.gettext("GIF image");
+    private final String jpgDesc = Messages.gettext("JPEG image");
+    private final String pngDesc = Messages.gettext("PNG image");
+    private final String ppmDesc = Messages.gettext("PPM image");
+    private final String emfDesc = Messages.gettext("Enhanced Metafile image (EMF)");
+    private final String epsDesc = Messages.gettext("Encapsulated PostScript image (EPS)");
+    private final String figDesc = Messages.gettext("FIG image");
+    private final String pdfDesc = Messages.gettext("PDF image");
+    private final String svgDesc = Messages.gettext("SVG image");
+    private final String allFilesDesc = Messages.gettext("All files");
+
+    private final String bmp = "bmp";
+    private final String gif = "gif";
+    private final String[] jpg = {"jpg", "jpeg"};
+    private final String png = "png";
+    private final String ppm = "ppm";
+    private final String emf = "emf";
+    private final String eps = "eps";
+    private final String fig = "fig";
+    private final String pdf = "pdf";
+    private final String svg = "svg";
+    private final String allFiles = "*";
+
+    private String exportName;
+    private String extensionSelected;
+    private int figureId;
+
+    /**
+     * Default constructor
+     * @param figureId id of the exported figure
+     */
+    public SwingScilabExportFileChooser(int figureId) {
+        super();
+        this.figureId = figureId;
+        exportCustomFileChooser(figureId);
+    }
+
+    /**
+     * We customize the file chooser for the graphic export
+     * by adding format selection
+     * @param figureId exported figure number
+     */
+    public void exportCustomFileChooser(int figureId) {
+        ArrayList<FileMask> v = new ArrayList<FileMask>(NB_FILE_MASKS);  /* The order does matter */
+        v.add(new FileMask(bmp, bmpDesc));
+        v.add(new FileMask(gif, gifDesc));
+        v.add(new FileMask(jpg, jpgDesc));
+        v.add(new FileMask(png, pngDesc));
+        v.add(new FileMask(ppm, ppmDesc));
+        v.add(new FileMask(emf, emfDesc));
+        v.add(new FileMask(eps, epsDesc));
+        v.add(new FileMask(fig, figDesc));
+        v.add(new FileMask(pdf, pdfDesc));
+        v.add(new FileMask(svg, svgDesc));
+        v.add(new FileMask(allFiles, allFilesDesc)); // should always be at the last position
+
+        super.setDialogTitle(Messages.gettext("Export"));
+        super.setApproveButtonText(Messages.gettext("Export"));
+        File exportFile = new File(Messages.gettext("Untitled-export"));
+        super.setSelectedFile(exportFile);
+        super.setAcceptAllFileFilterUsed(false);
+
+        this.figureId = figureId;
+
+        for (int i = 0; i < v.size(); i++) {
+            FileMask fm = (FileMask) v.get(i);
+            if (i == v.size() - 1) { /* Last case ... all files, remove the extension */
+                fm.clearExtensions();
+            }
+            super.addChoosableFileFilter(fm);
+        }
+
+        //Preview panel
+        JPanel panelPreview = new JPanel();
+
         //Title for preview panel
         TitledBorder titlePreview;
         titlePreview = BorderFactory.createTitledBorder(Messages.gettext("Preview"));
         panelPreview.setBorder(titlePreview);
-        
+
         //add preview image
-                panelPreview.add(new ImagePreview(this));               
-                
-                //Main panel contains extensionTable panel & preview panel
-                JPanel accessoryPanel = new JPanel();
-                
-                //accessoryPanel.add(scrollPane);               
-                accessoryPanel.add(panelPreview);
-                accessoryPanel.setVisible(true);        
-                super.setAccessory(accessoryPanel);
-                
-                JFrame frame = new JFrame();    
-                frame.setIconImage(new ImageIcon(System.getenv("SCI") + "/modules/gui/images/icons/scilab.png").getImage());
-                int selection = super.showSaveDialog(frame);            
-                if (selection == JFileChooser.APPROVE_OPTION) {
-
-                        this.exportName = super.getSelectedFile().getAbsolutePath();
-
-                        //Test if there is a file with the same name
-                        if (new File(this.exportName).exists()) {
-                                int actionDialog = JOptionPane.showConfirmDialog(
-                                                                                this, Messages.gettext("Replace existing file?"), 
-                                                                                Messages.gettext("File already exists"), 
-                                                                                JOptionPane.YES_NO_OPTION);
-
-                                if (actionDialog == JOptionPane.YES_OPTION) {
-
-                                } else {
-                                        return;
-                                }
-                        }
-                        
-                        /* Bug 3849 fix */
-                        ConfigManager.saveLastOpenedDirectory(new File(exportName).getParentFile().getPath());
-                        
-                        String extensionCombo = new String();
-                        try {
-                                // The try catch is necessary here when the user input the full
-                                // filename (foo.jpg) and press tab. It is going to update
-                                // the filter causing the following line to fail (cannot cast)
-                                // Therefor, we switch back to the allFiles (*) case.
-                                FileMask ft = (FileMask) super.getFileFilter();
-                                //get the extension from the Filter
-                                extensionCombo = ft.getExtensionFromFilter();
-                                if (extensionCombo == null) { extensionCombo = allFiles; }
-                        } catch (java.lang.ClassCastException e) {
-                                extensionCombo = allFiles;
-                        }
-
-                        if (extensionCombo.equals(allFiles)) {                          
-                                exportManager();        
-                        } else if (extensionCombo.equals(emf) || extensionCombo.equals(eps) || extensionCombo.equals(fig) 
-                                        || extensionCombo.equals(pdf) || extensionCombo.equals(svg)) {          
-                                vectorialExport(extensionCombo);
-                                
-                        } else {                                
-                                bitmapExport(extensionCombo);                           
-                        }
-                } else ; // no file chosen              
-                
-        }
-        
- 
-        /**
-         * Return the file extension
-         * @param fileName Name of the file
-         * @return the extension
-         */
-        public String getExtension(String fileName) {
-                if (fileName != null) {
-                        int i = fileName.lastIndexOf('.');
-                        if (i > 0 && i < fileName.length() - 1) {
-                                return fileName.substring(i + 1).toLowerCase();
-                        }
-                }
-                return null;
-        }
-        
-        /**
-         * Manage the export (bitmap/vectorial format) and export errors 
-         */
-        public void exportManager() {
-
-                //get the extension of the fileName chosen by the user (can be 'null')
-                String userExtension = getExtension(this.exportName);                   
-                
-                if (userExtension == null) {
-                        //fileName without extension + "by extension (.*)" selected
-                        JOptionPane.showMessageDialog(
-                                        this, Messages.gettext("Please specify a file format"), 
-                                        Messages.gettext("Error on export"), JOptionPane.ERROR_MESSAGE);
-                        return;
-                } else if (userExtension.equals(bmp)) {
-                        bitmapExport(userExtension);
-
-                } else if (userExtension.equals(gif)) {                 
-                        bitmapExport(userExtension);                    
-                        
-                } else if (userExtension.equals(jpg[0]) || userExtension.equals(jpg[1])) {
-                        bitmapExport(userExtension);
-                        
-                } else if (userExtension.equals(png)) {
-                        bitmapExport(userExtension);
-                        
-                } else if (userExtension.equals(ppm)) {
-                        bitmapExport(userExtension);
-                
-                } else if (userExtension.equals(emf)) {
-                        vectorialExport(userExtension);
-                        
-                } else if (userExtension.equals(eps)) {
-                        vectorialExport(userExtension);
-                                
-                } else if (userExtension.equals(fig)) {
-                        vectorialExport(userExtension);
-                
-                } else if (userExtension.equals(pdf)) {
-                        vectorialExport(userExtension);
-                
-                } else if (userExtension.equals(svg)) {
-                        vectorialExport(userExtension);
-                        
-                } else {
-                        //fileName with a wrong extension + "by extension (.*)" selected
-                        JOptionPane.showMessageDialog(
-                                        this, Messages.gettext("Unrecognized extension '") 
-                                        + userExtension + Messages.gettext("'.\n Please specify a valid file format."), 
-                                        Messages.gettext("Error on export"), JOptionPane.ERROR_MESSAGE);
-                        return;
-                }               
-        }
-        
-        /**
-         * Export an bitmap file
-         * @param userExtension extension caught by the user
-         */
-        public void bitmapExport(String userExtension) {
-                ExportData exportData = new ExportData(figureId, this.exportName, userExtension, null);
-
-                String actualFilename = exportData.getExportName();
-                if (this.getExtension(actualFilename) == null) {
-                        // Could not get the extension from the user input
-                        // take the one from the list
-                        actualFilename += "." + userExtension;
-                }
-
-                //the export instruction for the selected format
-                String exportcmd = "xs2" + exportData.getExportExtension() 
-                + "(" + figureId + ", '" + actualFilename + "');";
-                InterpreterManagement.putCommandInScilabQueue(exportcmd);               
-        }
-        
-        /**
-         * Export an bitmap file
-         * @param userExtension extension caught by the user
-         */
-        public void vectorialExport(String userExtension) {
-                ExportData exportData = new ExportData(figureId, this.exportName, userExtension, null);
-                ExportOptionWindow exportOptionWindow = new ExportOptionWindow(exportData);             
-        exportOptionWindow.displayOptionWindow();
-                exportOptionWindow.landscapePortraitOption();
-        }
+        panelPreview.add(new ImagePreview(this));
+
+        //Main panel contains extensionTable panel & preview panel
+        JPanel accessoryPanel = new JPanel();
+
+        //accessoryPanel.add(scrollPane);
+        accessoryPanel.add(panelPreview);
+        accessoryPanel.setVisible(true);
+        super.setAccessory(accessoryPanel);
+
+        Tab tab = ((ScilabRendererProperties) FigureMapper.getCorrespondingFigure(figureId).getRendererProperties()).getParentTab();
+        Window parentWindow = (Window) SwingUtilities.getAncestorOfClass(Window.class, (JComponent) tab.getAsSimpleTab());
+
+        int selection = super.showSaveDialog((Component) parentWindow);
+        if (selection == JFileChooser.APPROVE_OPTION) {
+
+            this.exportName = super.getSelectedFile().getAbsolutePath();
+
+            //Test if there is a file with the same name
+            if (new File(this.exportName).exists()) {
+                int actionDialog = JOptionPane.showConfirmDialog(
+                    this, Messages.gettext("Replace existing file?"),
+                    Messages.gettext("File already exists"),
+                    JOptionPane.YES_NO_OPTION);
+
+                if (actionDialog == JOptionPane.YES_OPTION) {
+
+                } else {
+                    return;
+                }
+            }
+
+            /* Bug 3849 fix */
+            ConfigManager.saveLastOpenedDirectory(new File(exportName).getParentFile().getPath());
+
+            String extensionCombo = new String();
+            try {
+                // The try catch is necessary here when the user input the full
+                // filename (foo.jpg) and press tab. It is going to update
+                // the filter causing the following line to fail (cannot cast)
+                // Therefor, we switch back to the allFiles (*) case.
+                FileMask ft = (FileMask) super.getFileFilter();
+                //get the extension from the Filter
+                extensionCombo = ft.getExtensionFromFilter();
+                if (extensionCombo == null) { extensionCombo = allFiles; }
+            } catch (java.lang.ClassCastException e) {
+                extensionCombo = allFiles;
+            }
+
+            if (extensionCombo.equals(allFiles)) {
+                exportManager();
+            } else if (extensionCombo.equals(emf) || extensionCombo.equals(eps) || extensionCombo.equals(fig)
+                       || extensionCombo.equals(pdf) || extensionCombo.equals(svg)) {
+                vectorialExport(extensionCombo);
+
+            } else {
+                bitmapExport(extensionCombo);
+            }
+        } else ; // no file chosen
+    }
+
+    /**
+     * Return the file extension
+     * @param fileName Name of the file
+     * @return the extension
+     */
+    public String getExtension(String fileName) {
+        if (fileName != null) {
+            int i = fileName.lastIndexOf('.');
+            if (i > 0 && i < fileName.length() - 1) {
+                return fileName.substring(i + 1).toLowerCase();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Manage the export (bitmap/vectorial format) and export errors
+     */
+    public void exportManager() {
+        //get the extension of the fileName chosen by the user (can be 'null')
+        String userExtension = getExtension(this.exportName);
+
+        if (userExtension == null) {
+            //fileName without extension + "by extension (.*)" selected
+            JOptionPane.showMessageDialog(
+                this, Messages.gettext("Please specify a file format"),
+                Messages.gettext("Error on export"), JOptionPane.ERROR_MESSAGE);
+            return;
+        } else if (userExtension.equals(bmp)) {
+            bitmapExport(userExtension);
+
+        } else if (userExtension.equals(gif)) {
+            bitmapExport(userExtension);
+
+        } else if (userExtension.equals(jpg[0]) || userExtension.equals(jpg[1])) {
+            bitmapExport(userExtension);
+
+        } else if (userExtension.equals(png)) {
+            bitmapExport(userExtension);
+
+        } else if (userExtension.equals(ppm)) {
+            bitmapExport(userExtension);
+
+        } else if (userExtension.equals(emf)) {
+            vectorialExport(userExtension);
+
+        } else if (userExtension.equals(eps)) {
+            vectorialExport(userExtension);
+
+        } else if (userExtension.equals(fig)) {
+            vectorialExport(userExtension);
+
+        } else if (userExtension.equals(pdf)) {
+            vectorialExport(userExtension);
+
+        } else if (userExtension.equals(svg)) {
+            vectorialExport(userExtension);
+
+        } else {
+            //fileName with a wrong extension + "by extension (.*)" selected
+            JOptionPane.showMessageDialog(
+                this, Messages.gettext("Unrecognized extension '")
+                + userExtension + Messages.gettext("'.\n Please specify a valid file format."),
+                Messages.gettext("Error on export"), JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+    }
+
+    /**
+     * Export an bitmap file
+     * @param userExtension extension caught by the user
+     */
+    public void bitmapExport(String userExtension) {
+        ExportData exportData = new ExportData(figureId, this.exportName, userExtension, null);
+
+        String actualFilename = exportData.getExportName();
+        if (this.getExtension(actualFilename) == null) {
+            // Could not get the extension from the user input
+            // take the one from the list
+            actualFilename += "." + userExtension;
+        }
+
+        //the export instruction for the selected format
+        String exportcmd = "xs2" + exportData.getExportExtension()
+            + "(" + figureId + ", '" + actualFilename + "');";
+        InterpreterManagement.putCommandInScilabQueue(exportcmd);
+    }
 
+    /**
+     * Export an bitmap file
+     * @param userExtension extension caught by the user
+     */
+    public void vectorialExport(String userExtension) {
+        Tab parentTab = ((ScilabRendererProperties) FigureMapper.getCorrespondingFigure(figureId).getRendererProperties()).getParentTab();
+        ExportData exportData = new ExportData(figureId, this.exportName, userExtension, null);
+        ExportOptionWindow exportOptionWindow = new ExportOptionWindow(exportData);
+        exportOptionWindow.displayOptionWindow(parentTab);
+        exportOptionWindow.landscapePortraitOption();
+    }
 }