X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=556bb7254940ef0db86bd4477cb4b2bb15fcfcdc;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=585ed4fa98129837a49d1f3e40d69e5e1b7d3c04;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 585ed4f..556bb72 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,12 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-/*///////////////////////////////////////////////////////////////////
-// This file was taken from java forum
-// Re: JFileChooser functioning like normal Windows Apps FileChooser
-// Author: ddanimal
-// http://forum.java.sun.com/thread.jspa?forumID=57&threadID=327712
-*/
 
 //////////////////////////////////////////////////////////////////
 package jalview.io;
@@ -32,23 +26,48 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
-import javax.swing.table.*;
 
 public class JalviewFileChooser
     extends JFileChooser
 {
 
+  public JalviewFileChooser(String dir)
+  {
+    super(dir);
+    setAccessory(new RecentlyOpened());
+  }
+
+  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,
+  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]);
@@ -65,42 +84,53 @@ public class JalviewFileChooser
       setFileFilter(chosen);
     }
 
+    setAccessory(new RecentlyOpened());
   }
 
-
   public void setFileFilter(javax.swing.filechooser.FileFilter filter)
- {
-   super.setFileFilter(filter);
-
-   if (!(getUI() instanceof BasicFileChooserUI)) {
-           return;
-   }
-
-   final BasicFileChooserUI ui = (BasicFileChooserUI) getUI();
-   final String name = ui.getFileName().trim();
-
-   if ((name == null) || (name.length() == 0)) {
-           return;
-   }
+  {
+    super.setFileFilter(filter);
 
-   EventQueue.invokeLater(new Thread() {
-           public void run() {
-                   String currentName = ui.getFileName();
-                   if ((currentName == null) || (currentName.length() == 0)) {
-                           ui.setFileName(name);
-                   }
-           }
-	});
- }
+    try
+    {
+      if (getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)
+      {
+        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))
+        {
+          return;
+        }
 
-  public JalviewFileChooser(String dir)
-  {
-    super(dir);
+        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"))
@@ -138,9 +168,11 @@ 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)
     {
@@ -164,304 +196,81 @@ public class JalviewFileChooser
 
       if (confirm != JOptionPane.YES_OPTION)
       {
-        ret = this.CANCEL_OPTION;
+        ret = JalviewFileChooser.CANCEL_OPTION;
       }
     }
 
     return ret;
   }
 
-  /**************************************************************************
-   * Always create the local UI
-   * @param comp
-   *************************************************************************/
-  public final void setUI(ComponentUI comp)
-  {
-    super.setUI(new UI(this));
-  }
-
-  /**************************************************************************
-   * Internal implementation of Metal LookAndFeel to create the table sorting
-   * ability.
-   *************************************************************************/
-  private class UI
-      extends MetalFileChooserUI
+  void recentListSelectionChanged(String selection)
   {
-    private DirectoryModel model;
-
-    /**************************************************************************
-     * Must be overridden to extend
-     * @param e
-     *************************************************************************/
-    public UI(JFileChooser e)
-    {
-      super(e);
-    }
+    setSelectedFile(null);
 
-    /**************************************************************************
-     * Overridden to create our own model
-     *************************************************************************/
-    protected final void createModel()
-    {
-      model = new DirectoryModel(getFileChooser());
-    }
-
-    /**************************************************************************
-     * Overridden to get our own model
-     * @return
-     *************************************************************************/
-    public final BasicDirectoryModel getModel()
-    {
-      return model;
-    }
-
-    /**************************************************************************
-     * Calls the default method then adds a MouseListener to the JTable
-     * @param chooser
-     * @return
-     *************************************************************************/
-    protected final JPanel createDetailsView(JFileChooser chooser)
+    File file = new File(selection);
+    if (getFileFilter() instanceof JalviewFileFilter)
     {
-      final JPanel panel = super.createDetailsView(chooser);
-
-      //Since we can't access MetalFileChooserUI's private member detailsTable
-      //directly, we have to find it in the JPanel
-      final JTable tbl = findJTable(panel.getComponents());
+      JalviewFileFilter jvf = (JalviewFileFilter)this.getFileFilter();
 
-      if (tbl != null)
+      if (!jvf.accept(file))
       {
-        //Add a mouselistener to listen for presses on column headers
-        tbl.getTableHeader().addMouseListener(new MouseAdapter()
-        {
-          public void mousePressed(MouseEvent e)
-          {
-
-            e.consume();
-
-            final int col = tbl.getTableHeader().columnAtPoint(e.getPoint());
-            model.sort(col, tbl);
-
-          }
-        });
+        setFileFilter(getChoosableFileFilters()[0]);
       }
-
-      return panel;
     }
 
-    /**************************************************************************
-     * Finds the JTable in the panel so we can add MouseListener
-     * @param comp
-     * @return
-     *************************************************************************/
-    private JTable findJTable(Component[] comp)
-    {
-      for (int i = 0; i < comp.length; i++)
-      {
-        if (comp[i] instanceof JTable)
-        {
-          return (JTable) comp[i];
-        }
-
-        if (comp[i] instanceof Container)
-        {
-          JTable tbl = findJTable( ( (Container) comp[i]).getComponents());
-
-          if (tbl != null)
-          {
-            return tbl;
-          }
-        }
-      }
-
-      return null;
-    }
+    setSelectedFile(file);
   }
 
-  /***************************************************************************
-   * Implementation of BasicDirectoryModel that sorts the Files by column
-   **************************************************************************/
-  private final  class DirectoryModel
-      extends BasicDirectoryModel
+  class RecentlyOpened
+      extends JPanel
   {
-    String sortingColumnName=null;
-    int col = 0;
-    boolean ascending;
-
-    /**************************************************************************
-     * Must be overridden to extend BasicDirectoryModel
-     * @param chooser
-     *************************************************************************/
-    DirectoryModel(JFileChooser chooser)
-    {
-      super(chooser);
-    }
-
-
-    /**************************************************************************
-     * Resorts the JFileChooser table based on new column
-     * @param c
-     *************************************************************************/
-    protected final void sort(int c, JTable tbl)
+    JList list;
+    public RecentlyOpened()
     {
+      String historyItems = jalview.bin.Cache.getProperty("RECENT_FILE");
+      StringTokenizer st;
+      Vector recent = new Vector();
 
-
-      //Set column and order
-      col = c;
-      ascending = !ascending;
-
-      String indicator = " (^)";
-
-      if (ascending)
+      if (historyItems != null)
       {
-        indicator = " (v)";
-      }
+        st = new StringTokenizer(historyItems, "\t");
 
-      final JTableHeader th = tbl.getTableHeader();
-      final TableColumnModel tcm = th.getColumnModel();
-      TableColumn tc = null;
-      String title = null;
-
-
-      //Remove indicator from old sort, and add to new
-      for(int i=0; i<tcm.getColumnCount(); i++)
-      {
-        tc = tcm.getColumn(i);
-        title = tc.getHeaderValue().toString();
-        if (title.endsWith(" (^)") || title.endsWith(" (v)"))
+        while (st.hasMoreTokens())
         {
-          title = title.substring(0, title.length() - 4);
+          recent.addElement(st.nextElement());
         }
-
-        if(i==col)
-        {
-          sortingColumnName = title;
-          title = title + indicator;
-        }
-
-        tc.setHeaderValue(title);
       }
 
-      //Requery the file listing
-      validateFileCache();
-    }
-
-    /**************************************************************************
-     * Sorts the data based on current column setting
-     * @param data
-     *************************************************************************/
-    protected final void sort(Vector data)
-    {
-        /*
-                        UIManager.getString("FileChooser.fileTypeHeaderText", l),
-                        UIManager.getString("FileChooser.fileAttrHeaderText", l)
-*/
-    if(sortingColumnName==null)
-      return;
+      list = new JList(recent);
 
+      DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
+      dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
+      list.setCellRenderer(dlcr);
 
-    if(sortingColumnName.equals(UIManager.getString("FileChooser.fileDateHeaderText")))
-    {
-      Collections.sort(data,
-                           new Comparator()
-          {
+      list.addMouseListener(new MouseAdapter()
+      {
+        public void mousePressed(MouseEvent evt)
+        {
+          recentListSelectionChanged(list.getSelectedValue().toString());
+        }
+      });
 
-            public int compare(Object o1, Object o2)
-            {
-              int ret = 1;
-              final File a = (File) o1;
-              final File b = (File) o2;
-
-              if (a.lastModified() > b.lastModified())
-              {
-                ret = -1;
-              }
-              else if (a.lastModified() == b.lastModified())
-              {
-                ret = 0;
-              }
-
-              if (ascending)
-              {
-                ret *= -1;
-              }
-
-              return ret;
-            }
-          });
-    }
-    else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileSizeHeaderText")))
-    {
+      this.setBorder(new javax.swing.border.TitledBorder("Recently Opened"));
 
-         Collections.sort(data,
-                           new Comparator()
-          {
+      final JScrollPane scroller = new JScrollPane(list);
+      scroller.setPreferredSize(new Dimension(130, 200));
+      this.add(scroller);
 
-            public int compare(Object o1, Object o2)
-            {
-              int ret = 1;
-              final File a = (File) o1;
-              final File b = (File) o2;
-
-              if (a.length() > b.length())
-              {
-                ret = -1;
-              }
-              else if (a.length() == b.length())
-              {
-                ret = 0;
-              }
-
-              if (ascending)
-              {
-                ret *= -1;
-              }
-
-              return ret;
-            }
-          });
-    }
-    else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileTypeHeaderText")))
-    {
-          Collections.sort(data,
-                           new Comparator()
-          {
-            public int compare(Object o1, Object o2)
-            {
-              final String a = getFileSystemView().getSystemTypeDescription( (File)o1 );
-              final String b = getFileSystemView().getSystemTypeDescription( (File)o2 );
-              if (ascending)
-              {
-                return a.compareToIgnoreCase(b);
-              }
-              else
-              {
-                return -1 * a.compareToIgnoreCase(b);
-              }
-            }
-          });
-      }
-      else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileNameHeaderText")))
-{
-      Collections.sort(data,
-                       new Comparator()
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
       {
-        public int compare(Object o1, Object o2)
+        public void run()
         {
-          final String a = ((File) o1).getName();
-          final String b = ((File) o2).getName();
-
-          if (ascending)
-          {
-            return a.compareToIgnoreCase(b);
-          }
-          else
-          {
-            return -1 * a.compareToIgnoreCase(b);
-          }
+          scroller.getHorizontalScrollBar().setValue(
+              scroller.getHorizontalScrollBar().getMaximum());
         }
       });
-  }
 
     }
+
   }
 }