Formatting

[jalview.git] / src / jalview / io / JalviewFileChooser.java

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 423f874..556bb72 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -21,10 +21,11 @@
 package jalview.io;\r
 \r
 import java.io.*;\r
+import java.util.*;\r
+\r
 import java.awt.*;\r
-import javax.swing.*;\r
 import java.awt.event.*;\r
-import java.util.*;\r
+import javax.swing.*;\r
 \r
 public class JalviewFileChooser\r
     extends JFileChooser\r
@@ -36,13 +37,37 @@ public class JalviewFileChooser
     setAccessory(new RecentlyOpened());\r
   }\r
 \r
-  public JalviewFileChooser(String dir, String[] suffix, String[] desc,\r
+  public JalviewFileChooser(String dir,\r
+                            String[] suffix,\r
+                            String[] desc,\r
+                            String selected,\r
+                            boolean selectAll)\r
+  {\r
+    super(dir);\r
+    init(suffix, desc, selected, selectAll);\r
+  }\r
+\r
+  public JalviewFileChooser(String dir,\r
+                            String[] suffix,\r
+                            String[] desc,\r
                             String selected)\r
   {\r
     super(dir);\r
+    init(suffix, desc, selected, true);\r
+  }\r
+\r
+  void init(String[] suffix,\r
+            String[] desc,\r
+            String selected,\r
+            boolean selectAll)\r
+  {\r
 \r
     JalviewFileFilter chosen = null;\r
 \r
+    //SelectAllFilter needs to be set first before adding further\r
+    //file filters to fix bug on Mac OSX\r
+    setAcceptAllFileFilterUsed(selectAll);\r
+\r
     for (int i = 0; i < suffix.length; i++)\r
     {\r
       JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);\r
@@ -58,16 +83,17 @@ public class JalviewFileChooser
     {\r
       setFileFilter(chosen);\r
     }\r
+\r
     setAccessory(new RecentlyOpened());\r
   }\r
 \r
-\r
   public void setFileFilter(javax.swing.filechooser.FileFilter filter)\r
   {\r
     super.setFileFilter(filter);\r
 \r
-    try{\r
-      if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)\r
+    try\r
+    {\r
+      if (getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)\r
       {\r
         final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.\r
             basic.BasicFileChooserUI) getUI();\r
@@ -90,15 +116,17 @@ public class JalviewFileChooser
           }\r
         });\r
       }\r
-    }catch(Exception ex)\r
+    }\r
+    catch (Exception ex)\r
     {\r
+      ex.printStackTrace();\r
       // Some platforms do not have BasicFileChooserUI\r
     }\r
   }\r
 \r
   public String getSelectedFormat()\r
   {\r
-    if(getFileFilter()==null)\r
+    if (getFileFilter() == null)\r
     {\r
       return null;\r
     }\r
@@ -144,7 +172,7 @@ public class JalviewFileChooser
 \r
     setDialogType(SAVE_DIALOG);\r
 \r
-    int ret = showDialog(parent, null);\r
+    int ret = showDialog(parent, "Save");\r
 \r
     if (getFileFilter() instanceof JalviewFileFilter)\r
     {\r
@@ -190,10 +218,11 @@ public class JalviewFileChooser
       }\r
     }\r
 \r
-     setSelectedFile( file );\r
+    setSelectedFile(file);\r
   }\r
 \r
-  class RecentlyOpened extends JPanel\r
+  class RecentlyOpened\r
+      extends JPanel\r
   {\r
     JList list;\r
     public RecentlyOpened()\r
@@ -213,18 +242,23 @@ public class JalviewFileChooser
       }\r
 \r
       list = new JList(recent);\r
+\r
+      DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
+      dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);\r
+      list.setCellRenderer(dlcr);\r
+\r
       list.addMouseListener(new MouseAdapter()\r
-          {\r
-            public void mousePressed(MouseEvent evt)\r
-            {\r
-              recentListSelectionChanged(list.getSelectedValue().toString());\r
-            }\r
-          });\r
+      {\r
+        public void mousePressed(MouseEvent evt)\r
+        {\r
+          recentListSelectionChanged(list.getSelectedValue().toString());\r
+        }\r
+      });\r
 \r
       this.setBorder(new javax.swing.border.TitledBorder("Recently Opened"));\r
 \r
       final JScrollPane scroller = new JScrollPane(list);\r
-      scroller.setPreferredSize(new Dimension(120, 200));\r
+      scroller.setPreferredSize(new Dimension(130, 200));\r
       this.add(scroller);\r
 \r
       javax.swing.SwingUtilities.invokeLater(new Runnable()\r
@@ -236,13 +270,7 @@ public class JalviewFileChooser
         }\r
       });\r
 \r
-\r
     }\r
 \r
   }\r
 }\r
-\r
-\r
-\r
-\r
-\r