From 2c012a6c95ee7a4017b9896a4cdcfe0dd280fcd2 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 19 May 2005 17:57:57 +0000
Subject: [PATCH] filechooser has multiple filters

---
 src/jalview/io/HTMLOutput.java         |    9 ++++---
 src/jalview/io/JalviewFileChooser.java |   43 +++++++++++++++++++++++++++++---
 src/jalview/io/JalviewFileFilter.java  |   23 +++++++++--------
 3 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index fd51823..76de744 100755
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -19,8 +19,11 @@ public class HTMLOutput
   {
     this.av = av;
     sr = new SequenceRenderer(av);
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")
-        , new String[]{"html"}, "HTML files");
+    JalviewFileChooser chooser = new JalviewFileChooser(
+      jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+      new String[]{"html"},
+      new String[]{"HTML files"},
+      "HTML files");
 
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle("Save as HTML");
@@ -29,7 +32,7 @@ public class HTMLOutput
     if(value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice =  chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile().getParent());
       try{
         PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(choice));
         out.println("<HTML>");
diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 5b4fa21..c8248ef 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -31,14 +31,44 @@ public class JalviewFileChooser extends JFileChooser
   private static String[] COLUMNS = null;
 
 
-  public JalviewFileChooser(String dir, String [] suffix, String desc)
+  public JalviewFileChooser(String dir, String [] suffix, String [] desc, String selected)
   {
     super(dir);
-    JalviewFileFilter filter = new JalviewFileFilter(suffix, desc);
-    this.setFileFilter(filter);
+
+    JalviewFileFilter chosen = null;
+    for(int i=0; i<suffix.length; i++)
+    {
+      JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);
+      addChoosableFileFilter(jvf);
+      if(selected!=null && selected.equals(desc[i]))
+        chosen = jvf;
+    }
+    if(chosen!=null)
+      setFileFilter(chosen);
     initColumns();
   }
 
+  public String getSelectedFormat()
+  {
+
+    String format = getFileFilter().getDescription();
+    if (format.startsWith("Jalview"))
+      format = "Jalview";
+    else if (format.startsWith("Fasta"))
+      format = "FASTA";
+    else if (format.startsWith("MSF"))
+      format = "MSF";
+    else if (format.startsWith("Clustal"))
+      format = "CLUSTAL";
+    else if (format.startsWith("BLC"))
+      format = "BLC";
+    else if (format.startsWith("PIR"))
+      format = "PIR";
+    else if (format.startsWith("PFAM"))
+      format = "PFAM";
+
+    return format;
+  }
   public JalviewFileChooser(String dir)
   {
     super(dir);
@@ -49,6 +79,13 @@ public class JalviewFileChooser extends JFileChooser
       setDialogType(SAVE_DIALOG);
       int ret = showDialog(parent, null);
 
+      JalviewFileFilter jvf = (JalviewFileFilter)getFileFilter();
+      if( !jvf.accept( getSelectedFile() ) )
+      {
+        String withExtension = getSelectedFile()+"."+jvf.getAcceptableExtension();
+        setSelectedFile(new File(withExtension));
+      }
+
       if(ret == JalviewFileChooser.APPROVE_OPTION  &&  getSelectedFile().exists() )
       {
        int confirm =  JOptionPane.showConfirmDialog(parent,
diff --git a/src/jalview/io/JalviewFileFilter.java b/src/jalview/io/JalviewFileFilter.java
index 85ac084..f19e5ea 100755
--- a/src/jalview/io/JalviewFileFilter.java
+++ b/src/jalview/io/JalviewFileFilter.java
@@ -15,26 +15,27 @@ public class JalviewFileFilter extends FileFilter
       private String fullDescription = "full description";
       private boolean useExtensionsInDescription = true;
 
-      public JalviewFileFilter() {
-          this.filters = new Hashtable();
-      }
-
-      public JalviewFileFilter(String extension) {
-          this(extension,null);
-      }
 
       public JalviewFileFilter(String extension, String description) {
-          this();
-          if(extension!=null) addExtension(extension);
-           if(description!=null) setDescription(description);
+
+       StringTokenizer st = new StringTokenizer(extension, ",");
+       while(st.hasMoreElements())
+       {
+         addExtension(st.nextToken().trim());
+       }
+       setDescription(description);
       }
 
       public JalviewFileFilter(String[] filts) {
           this(filts, null);
       }
 
+      public String getAcceptableExtension()
+      {
+        return filters.keys().nextElement().toString();
+      }
+
       public JalviewFileFilter(String[] filts, String description) {
-          this();
           for (int i = 0; i < filts.length; i++) {
               // add filters one by one
               addExtension(filts[i]);
-- 
1.7.10.2

