Moved comment so it doesn't break jalopy (this is not good!)

[jalview.git] / src / jalview / io / JalviewFileChooser.java

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index c8248ef..eca6e43 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -40,7 +40,7 @@ public class JalviewFileChooser extends JFileChooser
     {\r
       JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);\r
       addChoosableFileFilter(jvf);\r
-      if(selected!=null && selected.equals(desc[i]))\r
+      if(selected!=null && selected.equalsIgnoreCase(desc[i]))\r
         chosen = jvf;\r
     }\r
     if(chosen!=null)\r
@@ -52,19 +52,20 @@ public class JalviewFileChooser extends JFileChooser
   {\r
 \r
     String format = getFileFilter().getDescription();\r
-    if (format.startsWith("Jalview"))\r
+\r
+    if (format.toUpperCase().startsWith("JALVIEW"))\r
       format = "Jalview";\r
-    else if (format.startsWith("Fasta"))\r
+    else if (format.toUpperCase().startsWith("FASTA"))\r
       format = "FASTA";\r
-    else if (format.startsWith("MSF"))\r
+    else if (format.toUpperCase().startsWith("MSF"))\r
       format = "MSF";\r
-    else if (format.startsWith("Clustal"))\r
+    else if (format.toUpperCase().startsWith("CLUSTAL"))\r
       format = "CLUSTAL";\r
-    else if (format.startsWith("BLC"))\r
+    else if (format.toUpperCase().startsWith("BLC"))\r
       format = "BLC";\r
-    else if (format.startsWith("PIR"))\r
+    else if (format.toUpperCase().startsWith("PIR"))\r
       format = "PIR";\r
-    else if (format.startsWith("PFAM"))\r
+    else if (format.toUpperCase().startsWith("PFAM"))\r
       format = "PFAM";\r
 \r
     return format;\r
@@ -79,11 +80,14 @@ public class JalviewFileChooser extends JFileChooser
       setDialogType(SAVE_DIALOG);\r
       int ret = showDialog(parent, null);\r
 \r
-      JalviewFileFilter jvf = (JalviewFileFilter)getFileFilter();\r
-      if( !jvf.accept( getSelectedFile() ) )\r
+      if(getFileFilter() instanceof JalviewFileFilter)\r
       {\r
-        String withExtension = getSelectedFile()+"."+jvf.getAcceptableExtension();\r
-        setSelectedFile(new File(withExtension));\r
+        JalviewFileFilter jvf = (JalviewFileFilter) getFileFilter();\r
+        if (!jvf.accept(getSelectedFile()))\r
+        {\r
+          String withExtension = getSelectedFile() + "." + jvf.getAcceptableExtension();\r
+          setSelectedFile(new File(withExtension));\r
+        }\r
       }\r
 \r
       if(ret == JalviewFileChooser.APPROVE_OPTION  &&  getSelectedFile().exists() )\r
@@ -239,7 +243,7 @@ public class JalviewFileChooser extends JFileChooser
       *************************************************************************/\r
      protected final boolean lt(File a, File b)\r
      {\r
-       System.out.println("LT called?");\r
+       System.out.println("DEBUG:LT called?");\r
        boolean less = false;\r
        switch (col)\r
        {\r