X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=5484d38e521ced4cb6d7d5cd03a2cdae7bb255e4;hb=ca91ef118ff467dee590a67d8ea762c98451660a;hp=8050e975319130098fd525733bf6dbd2c7a0a4b2;hpb=be915dc80b72e8130c43d6f0e1f59a7c09938b65;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 8050e97..5484d38 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -23,6 +23,8 @@ package jalview.io;
 import java.io.*;
 import java.awt.*;
 import javax.swing.*;
+import java.awt.event.*;
+import java.util.*;
 
 public class JalviewFileChooser
     extends JFileChooser
@@ -31,15 +33,40 @@ public class JalviewFileChooser
   public JalviewFileChooser(String dir)
   {
     super(dir);
+    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]);
@@ -55,43 +82,54 @@ public class JalviewFileChooser
     {
       setFileFilter(chosen);
     }
+
+    setAccessory(new RecentlyOpened());
   }
 
+
   public void setFileFilter(javax.swing.filechooser.FileFilter filter)
   {
     super.setFileFilter(filter);
 
-    try{
-      final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.basic.
-          BasicFileChooserUI) getUI();
-      final String name = ui.getFileName().trim();
 
-      if ( (name == null) || (name.length() == 0))
+    try{
+      if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)
       {
-        return;
-      }
+        final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.
+            basic.BasicFileChooserUI) getUI();
+        final String name = ui.getFileName().trim();
 
-      EventQueue.invokeLater(new Thread()
-      {
-        public void run()
+        if ( (name == null) || (name.length() == 0))
         {
-          String currentName = ui.getFileName();
-          if ( (currentName == null) || (currentName.length() == 0))
-          {
-            ui.setFileName(name);
-          }
+          return;
         }
-      });
 
+        EventQueue.invokeLater(new Thread()
+        {
+          public void run()
+          {
+            String currentName = ui.getFileName();
+            if ( (currentName == null) || (currentName.length() == 0))
+            {
+              ui.setFileName(name);
+            }
+          }
+        });
+      }
     }catch(Exception ex)
     {
+      ex.printStackTrace();
       // Some platforms do not have BasicFileChooserUI
     }
   }
 
-
   public String getSelectedFormat()
   {
+    if(getFileFilter()==null)
+    {
+      return null;
+    }
+
     String format = getFileFilter().getDescription();
 
     if (format.toUpperCase().startsWith("JALVIEW"))
@@ -129,9 +167,12 @@ public class JalviewFileChooser
   public int showSaveDialog(Component parent)
       throws HeadlessException
   {
+    this.setAccessory(null);
+
+
     setDialogType(SAVE_DIALOG);
 
-    int ret = showDialog(parent, null);
+    int ret = showDialog(parent, "Save");
 
     if (getFileFilter() instanceof JalviewFileFilter)
     {
@@ -155,13 +196,87 @@ public class JalviewFileChooser
 
       if (confirm != JOptionPane.YES_OPTION)
       {
-        ret = this.CANCEL_OPTION;
+        ret = JalviewFileChooser.CANCEL_OPTION;
       }
     }
 
     return ret;
   }
+
+  void recentListSelectionChanged(String selection)
+  {
+    setSelectedFile(null);
+
+    File file = new File(selection);
+    if (getFileFilter() instanceof JalviewFileFilter)
+    {
+      JalviewFileFilter jvf = (JalviewFileFilter)this.getFileFilter();
+
+      if (!jvf.accept(file))
+      {
+        setFileFilter(getChoosableFileFilters()[0]);
+      }
+    }
+
+     setSelectedFile( file );
+  }
+
+  class RecentlyOpened extends JPanel
+  {
+    JList list;
+    public RecentlyOpened()
+    {
+      String historyItems = jalview.bin.Cache.getProperty("RECENT_FILE");
+      StringTokenizer st;
+      Vector recent = new Vector();
+
+      if (historyItems != null)
+      {
+        st = new StringTokenizer(historyItems, "\t");
+
+        while (st.hasMoreTokens())
+        {
+          recent.addElement(st.nextElement());
+        }
+      }
+
+      list = new JList(recent);
+
+      DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
+      dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
+      list.setCellRenderer(dlcr);
+
+
+      list.addMouseListener(new MouseAdapter()
+          {
+            public void mousePressed(MouseEvent evt)
+            {
+              recentListSelectionChanged(list.getSelectedValue().toString());
+            }
+          });
+
+      this.setBorder(new javax.swing.border.TitledBorder("Recently Opened"));
+
+      final JScrollPane scroller = new JScrollPane(list);
+      scroller.setPreferredSize(new Dimension(130, 200));
+      this.add(scroller);
+
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      {
+        public void run()
+        {
+          scroller.getHorizontalScrollBar().setValue(
+              scroller.getHorizontalScrollBar().getMaximum());
+        }
+      });
+
+
+    }
+
+  }
 }
 
 
 
+
+