X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=5484d38e521ced4cb6d7d5cd03a2cdae7bb255e4;hb=4f24ef0848cf3c43ba0467f31fce1baa5c57aad5;hp=b04a7051cffd33867202b7f264245b861a8c4143;hpb=5874ca652d08909c74d422552eb03a996112316d;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index b04a705..5484d38 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -36,13 +36,37 @@ public class JalviewFileChooser
     setAccessory(new RecentlyOpened());
   }
 
-  public JalviewFileChooser(String dir, String[] suffix, String[] desc,
+  public JalviewFileChooser(String dir,
+                            String[] suffix,
+                            String[] desc,
+                            String selected,
+                            boolean selectAll)
+  {
+    super(dir);
+    init( suffix, desc, selected, selectAll);
+  }
+
+  public JalviewFileChooser(String dir,
+                            String[] suffix,
+                            String[] desc,
                             String selected)
   {
     super(dir);
+    init( suffix, desc, selected, true);
+  }
+
+  void init(String[] suffix,
+            String[] desc,
+            String selected,
+            boolean selectAll)
+  {
 
     JalviewFileFilter chosen = null;
 
+    //SelectAllFilter needs to be set first before adding further
+    //file filters to fix bug on Mac OSX
+    setAcceptAllFileFilterUsed(selectAll);
+
     for (int i = 0; i < suffix.length; i++)
     {
       JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);
@@ -58,6 +82,7 @@ public class JalviewFileChooser
     {
       setFileFilter(chosen);
     }
+
     setAccessory(new RecentlyOpened());
   }
 
@@ -66,6 +91,7 @@ public class JalviewFileChooser
   {
     super.setFileFilter(filter);
 
+
     try{
       if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)
       {
@@ -92,6 +118,7 @@ public class JalviewFileChooser
       }
     }catch(Exception ex)
     {
+      ex.printStackTrace();
       // Some platforms do not have BasicFileChooserUI
     }
   }
@@ -142,9 +169,10 @@ public class JalviewFileChooser
   {
     this.setAccessory(null);
 
+
     setDialogType(SAVE_DIALOG);
 
-    int ret = showDialog(parent, null);
+    int ret = showDialog(parent, "Save");
 
     if (getFileFilter() instanceof JalviewFileFilter)
     {
@@ -213,6 +241,12 @@ public class JalviewFileChooser
       }
 
       list = new JList(recent);
+
+      DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
+      dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
+      list.setCellRenderer(dlcr);
+
+
       list.addMouseListener(new MouseAdapter()
           {
             public void mousePressed(MouseEvent evt)
@@ -223,12 +257,19 @@ public class JalviewFileChooser
 
       this.setBorder(new javax.swing.border.TitledBorder("Recently Opened"));
 
-      JScrollPane scroller = new JScrollPane(list);
-      scroller.setPreferredSize(new Dimension(250, 200));
+      final JScrollPane scroller = new JScrollPane(list);
+      scroller.setPreferredSize(new Dimension(130, 200));
       this.add(scroller);
-      scroller.getHorizontalScrollBar()
-          .setValue(scroller.getHorizontalScrollBar().getMaximum()
-          );
+
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      {
+        public void run()
+        {
+          scroller.getHorizontalScrollBar().setValue(
+              scroller.getHorizontalScrollBar().getMaximum());
+        }
+      });
+
 
     }