Use default fileChooser for now

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 08b99c2..d5ac106 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -16,17 +16,20 @@
  * along with this program; if not, write to the Free Software\r
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
  */\r
-/*///////////////////////////////////////////////////////////////////\r
-// This file was taken from java forum\r
-// Re: JFileChooser functioning like normal Windows Apps FileChooser\r
-// Author: ddanimal\r
-// http://forum.java.sun.com/thread.jspa?forumID=57&threadID=327712\r
-*/\r
 \r
 //////////////////////////////////////////////////////////////////\r
 package jalview.io;\r
 \r
 import java.io.*;\r
+import java.awt.*;\r
+import java.awt.event.*;\r
+import java.util.*;\r
+import java.util.List;\r
+\r
+import javax.swing.*;\r
+import javax.swing.event.TableModelEvent;\r
+import javax.swing.event.TableModelListener;\r
+import javax.swing.table.*;\r
 import java.util.*;\r
 \r
 import java.awt.*;\r
@@ -36,11 +39,17 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;\r
 import javax.swing.plaf.metal.*;\r
 import javax.swing.table.*;\r
+import javax.swing.event.*;\r
+import java.text.*;\r
 \r
 public class JalviewFileChooser\r
     extends JFileChooser\r
 {\r
 \r
+  public JalviewFileChooser(String dir)\r
+  {\r
+    super(dir);\r
+  }\r
 \r
   public JalviewFileChooser(String dir, String[] suffix, String[] desc,\r
                             String selected)\r
@@ -64,41 +73,39 @@ public class JalviewFileChooser
     {\r
       setFileFilter(chosen);\r
     }\r
-\r
   }\r
 \r
-\r
   public void setFileFilter(javax.swing.filechooser.FileFilter filter)\r
- {\r
-   super.setFileFilter(filter);\r
-\r
-   if (!(getUI() instanceof BasicFileChooserUI)) {\r
-           return;\r
-   }\r
-\r
-   final BasicFileChooserUI ui = (BasicFileChooserUI) getUI();\r
-   final String name = ui.getFileName().trim();\r
+  {\r
+    super.setFileFilter(filter);\r
 \r
-   if ((name == null) || (name.length() == 0)) {\r
-           return;\r
-   }\r
+    if (! (getUI() instanceof BasicFileChooserUI))\r
+    {\r
+      return;\r
+    }\r
 \r
-   EventQueue.invokeLater(new Thread() {\r
-           public void run() {\r
-                   String currentName = ui.getFileName();\r
-                   if ((currentName == null) || (currentName.length() == 0)) {\r
-                           ui.setFileName(name);\r
-                   }\r
-           }\r
-       });\r
- }\r
+    final BasicFileChooserUI ui = (BasicFileChooserUI) getUI();\r
+    final String name = ui.getFileName().trim();\r
 \r
+    if ( (name == null) || (name.length() == 0))\r
+    {\r
+      return;\r
+    }\r
 \r
-  public JalviewFileChooser(String dir)\r
-  {\r
-    super(dir);\r
+    EventQueue.invokeLater(new Thread()\r
+    {\r
+      public void run()\r
+      {\r
+        String currentName = ui.getFileName();\r
+        if ( (currentName == null) || (currentName.length() == 0))\r
+        {\r
+          ui.setFileName(name);\r
+        }\r
+      }\r
+    });\r
   }\r
 \r
+\r
   public String getSelectedFormat()\r
   {\r
     String format = getFileFilter().getDescription();\r
@@ -170,306 +177,7 @@ public class JalviewFileChooser
 \r
     return ret;\r
   }\r
+}\r
 \r
 \r
 \r
-  /**************************************************************************\r
-   * Always create the local UI\r
-   * @param comp\r
-   *************************************************************************/\r
-  public final void setUI(ComponentUI comp)\r
-  {\r
-    UI ui = new UI(this);\r
-\r
-    super.setUI(ui);\r
-  }\r
-\r
-  /**************************************************************************\r
-   * Internal implementation of Metal LookAndFeel to create the table sorting\r
-   * ability.\r
-   *************************************************************************/\r
-  private class UI\r
-      extends MetalFileChooserUI\r
-  {\r
-    private DirectoryModel model;\r
-\r
-    /**************************************************************************\r
-     * Must be overridden to extend\r
-     * @param e\r
-     *************************************************************************/\r
-    public UI(JFileChooser e)\r
-    {\r
-      super(e);\r
-      try{\r
-        this.installIcons(e);\r
-      }catch(Exception ex)\r
-      { System.out.println(ex+"\nProblem installing icons, FileChooser");}\r
-    }\r
-\r
-    /**************************************************************************\r
-     * Overridden to create our own model\r
-     *************************************************************************/\r
-    protected final void createModel()\r
-    {\r
-      model = new DirectoryModel(getFileChooser());\r
-    }\r
-\r
-    /**************************************************************************\r
-     * Overridden to get our own model\r
-     * @return\r
-     *************************************************************************/\r
-    public final BasicDirectoryModel getModel()\r
-    {\r
-      return model;\r
-    }\r
-\r
-    /**************************************************************************\r
-     * Calls the default method then adds a MouseListener to the JTable\r
-     * @param chooser\r
-     * @return\r
-     *************************************************************************/\r
-    protected final JPanel createDetailsView(JFileChooser chooser)\r
-    {\r
-      final JPanel panel = super.createDetailsView(chooser);\r
-\r
-      //Since we can't access MetalFileChooserUI's private member detailsTable\r
-      //directly, we have to find it in the JPanel\r
-      final JTable tbl = findJTable(panel.getComponents());\r
-\r
-      if (tbl != null)\r
-      {\r
-        //Add a mouselistener to listen for presses on column headers\r
-        tbl.getTableHeader().addMouseListener(new MouseAdapter()\r
-        {\r
-          public void mousePressed(MouseEvent e)\r
-          {\r
-\r
-            e.consume();\r
-\r
-            final int col = tbl.getTableHeader().columnAtPoint(e.getPoint());\r
-            model.sort(col, tbl);\r
-\r
-          }\r
-        });\r
-      }\r
-\r
-      return panel;\r
-    }\r
-\r
-    /**************************************************************************\r
-     * Finds the JTable in the panel so we can add MouseListener\r
-     * @param comp\r
-     * @return\r
-     *************************************************************************/\r
-    private JTable findJTable(Component[] comp)\r
-    {\r
-      for (int i = 0; i < comp.length; i++)\r
-      {\r
-        if (comp[i] instanceof JTable)\r
-        {\r
-          return (JTable) comp[i];\r
-        }\r
-\r
-        if (comp[i] instanceof Container)\r
-        {\r
-          JTable tbl = findJTable( ( (Container) comp[i]).getComponents());\r
-\r
-          if (tbl != null)\r
-          {\r
-            return tbl;\r
-          }\r
-        }\r
-      }\r
-\r
-      return null;\r
-    }\r
-  }\r
-\r
-  /***************************************************************************\r
-   * Implementation of BasicDirectoryModel that sorts the Files by column\r
-   **************************************************************************/\r
-  private final  class DirectoryModel\r
-      extends BasicDirectoryModel\r
-  {\r
-    String sortingColumnName=null;\r
-    int col = 0;\r
-    boolean ascending;\r
-\r
-    /**************************************************************************\r
-     * Must be overridden to extend BasicDirectoryModel\r
-     * @param chooser\r
-     *************************************************************************/\r
-    DirectoryModel(JFileChooser chooser)\r
-    {\r
-      super(chooser);\r
-    }\r
-\r
-\r
-    /**************************************************************************\r
-     * Resorts the JFileChooser table based on new column\r
-     * @param c\r
-     *************************************************************************/\r
-    protected final void sort(int c, JTable tbl)\r
-    {\r
-\r
-\r
-      //Set column and order\r
-      col = c;\r
-      ascending = !ascending;\r
-\r
-      String indicator = " (^)";\r
-\r
-      if (ascending)\r
-      {\r
-        indicator = " (v)";\r
-      }\r
-\r
-      final JTableHeader th = tbl.getTableHeader();\r
-      final TableColumnModel tcm = th.getColumnModel();\r
-      TableColumn tc = null;\r
-      String title = null;\r
-\r
-\r
-      //Remove indicator from old sort, and add to new\r
-      for(int i=0; i<tcm.getColumnCount(); i++)\r
-      {\r
-        tc = tcm.getColumn(i);\r
-        title = tc.getHeaderValue().toString();\r
-        if (title.endsWith(" (^)") || title.endsWith(" (v)"))\r
-        {\r
-          title = title.substring(0, title.length() - 4);\r
-        }\r
-\r
-        if(i==col)\r
-        {\r
-          sortingColumnName = title;\r
-          title = title + indicator;\r
-        }\r
-\r
-        tc.setHeaderValue(title);\r
-      }\r
-\r
-      //Requery the file listing\r
-      validateFileCache();\r
-    }\r
-\r
-    /**************************************************************************\r
-     * Sorts the data based on current column setting\r
-     * @param data\r
-     *************************************************************************/\r
-    protected final void sort(Vector data)\r
-    {\r
-        /*\r
-                        UIManager.getString("FileChooser.fileTypeHeaderText", l),\r
-                        UIManager.getString("FileChooser.fileAttrHeaderText", l)\r
-*/\r
-    if(sortingColumnName==null)\r
-      return;\r
-\r
-\r
-    if(sortingColumnName.equals(UIManager.getString("FileChooser.fileDateHeaderText")))\r
-    {\r
-      Collections.sort(data,\r
-                           new Comparator()\r
-          {\r
-\r
-            public int compare(Object o1, Object o2)\r
-            {\r
-              int ret = 1;\r
-              final File a = (File) o1;\r
-              final File b = (File) o2;\r
-\r
-              if (a.lastModified() > b.lastModified())\r
-              {\r
-                ret = -1;\r
-              }\r
-              else if (a.lastModified() == b.lastModified())\r
-              {\r
-                ret = 0;\r
-              }\r
-\r
-              if (ascending)\r
-              {\r
-                ret *= -1;\r
-              }\r
-\r
-              return ret;\r
-            }\r
-          });\r
-    }\r
-    else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileSizeHeaderText")))\r
-    {\r
-\r
-         Collections.sort(data,\r
-                           new Comparator()\r
-          {\r
-\r
-            public int compare(Object o1, Object o2)\r
-            {\r
-              int ret = 1;\r
-              final File a = (File) o1;\r
-              final File b = (File) o2;\r
-\r
-              if (a.length() > b.length())\r
-              {\r
-                ret = -1;\r
-              }\r
-              else if (a.length() == b.length())\r
-              {\r
-                ret = 0;\r
-              }\r
-\r
-              if (ascending)\r
-              {\r
-                ret *= -1;\r
-              }\r
-\r
-              return ret;\r
-            }\r
-          });\r
-    }\r
-    else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileTypeHeaderText")))\r
-    {\r
-          Collections.sort(data,\r
-                           new Comparator()\r
-          {\r
-            public int compare(Object o1, Object o2)\r
-            {\r
-              final String a = getFileSystemView().getSystemTypeDescription( (File)o1 );\r
-              final String b = getFileSystemView().getSystemTypeDescription( (File)o2 );\r
-              if (ascending)\r
-              {\r
-                return a.compareToIgnoreCase(b);\r
-              }\r
-              else\r
-              {\r
-                return -1 * a.compareToIgnoreCase(b);\r
-              }\r
-            }\r
-          });\r
-      }\r
-      else if(sortingColumnName.equals(UIManager.getString("FileChooser.fileNameHeaderText")))\r
-{\r
-      Collections.sort(data,\r
-                       new Comparator()\r
-      {\r
-        public int compare(Object o1, Object o2)\r
-        {\r
-          final String a = ((File) o1).getName();\r
-          final String b = ((File) o2).getName();\r
-\r
-          if (ascending)\r
-          {\r
-            return a.compareToIgnoreCase(b);\r
-          }\r
-          else\r
-          {\r
-            return -1 * a.compareToIgnoreCase(b);\r
-          }\r
-        }\r
-      });\r
-  }\r
-\r
-    }\r
-  }\r
-}\r