X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=7ccdaa96a456ce94a78be8627e0386c12cdb9c62;hb=3877548f65e22f91bae557c3d9edb17d75fbf2c9;hp=7e1aaa1ff443fc74d6200100c4398dfdf05c7cc4;hpb=74b531f56bbaad5c5e06a4744980256fe8110923;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 7e1aaa1..7ccdaa9 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -21,6 +21,7 @@
 //////////////////////////////////////////////////////////////////
 package jalview.io;
 
+import jalview.gui.JvOptionPane;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 
@@ -32,7 +33,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -40,7 +40,6 @@ import java.util.Vector;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JFileChooser;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SpringLayout;
@@ -63,11 +62,9 @@ public class JalviewFileChooser extends JFileChooser
    * 
    * @param directory
    * @param selected
-   * @param selectAll
    * @return
    */
-  public static JalviewFileChooser forRead(String directory,
-          String selected, boolean selectAll)
+  public static JalviewFileChooser forRead(String directory, String selected)
   {
     List<String> extensions = new ArrayList<String>();
     List<String> descs = new ArrayList<String>();
@@ -76,13 +73,12 @@ public class JalviewFileChooser extends JFileChooser
       if (format.isReadable())
       {
         extensions.add(format.getExtensions());
-        descs.add(format.getShortDescription());
+        descs.add(format.toString());
       }
     }
     return new JalviewFileChooser(directory,
             extensions.toArray(new String[extensions.size()]),
-            descs.toArray(new String[descs.size()]),
-            selected);
+            descs.toArray(new String[descs.size()]), selected, true);
   }
 
   /**
@@ -91,11 +87,10 @@ public class JalviewFileChooser extends JFileChooser
    * 
    * @param directory
    * @param selected
-   * @param selectAll
    * @return
    */
   public static JalviewFileChooser forWrite(String directory,
-          String selected, boolean selectAll)
+          String selected)
   {
     // TODO in Java 8, forRead and forWrite can be a single method
     // with a lambda expression parameter for isReadable/isWritable
@@ -106,12 +101,12 @@ public class JalviewFileChooser extends JFileChooser
       if (format.isWritable())
       {
         extensions.add(format.getExtensions());
-        descs.add(format.getShortDescription());
+        descs.add(format.toString());
       }
     }
     return new JalviewFileChooser(directory,
             extensions.toArray(new String[extensions.size()]),
-            descs.toArray(new String[descs.size()]), selected);
+            descs.toArray(new String[descs.size()]), selected, false);
   }
 
   public JalviewFileChooser(String dir)
@@ -120,16 +115,29 @@ public class JalviewFileChooser extends JFileChooser
     setAccessory(new RecentlyOpened());
   }
 
-  public JalviewFileChooser(String dir, String extension, String desc,
+  public JalviewFileChooser(String dir, String[] suffix, String[] desc,
           String selected)
   {
-    super(safePath(dir));
-    init(Collections.singletonList(new String[] { extension, desc }),
-            selected);
+    this(dir, suffix, desc, selected, true);
   }
 
-  public JalviewFileChooser(String dir, String[] extensions, String[] descs,
-          String selected)
+  /**
+   * Constructor for a single choice of file extension and description
+   * 
+   * @param dir
+   * @param extension
+   * @param desc
+   */
+  public JalviewFileChooser(String dir, String extension, String desc)
+  {
+    // TODO inline dir as Cache.getProperty("LAST_DIRECTORY") ? if applet
+    // builds ok
+    this(dir, new String[] { extension }, new String[] { desc }, desc,
+            true);
+  }
+
+  JalviewFileChooser(String dir, String[] extensions, String[] descs,
+          String selected, boolean allFiles)
   {
     super(safePath(dir));
     if (extensions.length == descs.length)
@@ -139,7 +147,7 @@ public class JalviewFileChooser extends JFileChooser
       {
         formats.add(new String[] { extensions[i], descs[i] });
       }
-      init(formats, selected);
+      init(formats, selected, allFiles);
     }
     else
     {
@@ -168,15 +176,17 @@ public class JalviewFileChooser extends JFileChooser
    * @param formats
    *          a list of {extensions, description} for each file format
    * @param selected
+   * @param allFiles
+   *          if true, 'any format' option is included
    */
-  void init(List<String[]> formats, String selected)
+  void init(List<String[]> formats, String selected, boolean allFiles)
   {
 
     JalviewFileFilter chosen = null;
 
     // SelectAllFilter needs to be set first before adding further
     // file filters to fix bug on Mac OSX
-    setAcceptAllFileFilterUsed(true);
+    setAcceptAllFileFilterUsed(allFiles);
 
     for (String[] format : formats)
     {
@@ -233,6 +243,11 @@ public class JalviewFileChooser extends JFileChooser
     }
   }
 
+  /**
+   * Returns the selected file format, or null if none selected
+   * 
+   * @return
+   */
   public FileFormatI getSelectedFormat()
   {
     if (getFileFilter() == null)
@@ -240,9 +255,27 @@ public class JalviewFileChooser extends JFileChooser
       return null;
     }
 
+    /*
+     * logic here depends on option description being formatted as 
+     * formatName (extension, extension...)
+     * or the 'no option selected' value
+     * All Files
+     * @see JalviewFileFilter.getDescription
+     */
     String format = getFileFilter().getDescription();
-    format = format.substring(0, format.indexOf("(") - 1);
-    return FileFormat.valueOf(format);
+    int parenPos = format.indexOf("(");
+    if (parenPos > 0)
+    {
+      format = format.substring(0, parenPos).trim();
+      try
+      {
+        return FileFormat.valueOf(format);
+      } catch (IllegalArgumentException e)
+      {
+        System.err.println("Unexpected format: " + format);
+      }
+    }
+    return null;
   }
 
   @Override
@@ -270,12 +303,12 @@ public class JalviewFileChooser extends JFileChooser
     if ((ret == JalviewFileChooser.APPROVE_OPTION)
             && getSelectedFile().exists())
     {
-      int confirm = JOptionPane.showConfirmDialog(parent,
+      int confirm = JvOptionPane.showConfirmDialog(parent,
               MessageManager.getString("label.overwrite_existing_file"),
               MessageManager.getString("label.file_already_exists"),
-              JOptionPane.YES_NO_OPTION);
+              JvOptionPane.YES_NO_OPTION);
 
-      if (confirm != JOptionPane.YES_OPTION)
+      if (confirm != JvOptionPane.YES_OPTION)
       {
         ret = JalviewFileChooser.CANCEL_OPTION;
       }