Fasta FASTA

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 300be96..3302fff 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -65,7 +65,7 @@ public class AlignFrame extends GAlignFrame
   {\r
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
         ,  new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},\r
-          new String[]{"FASTA", "CLUSTAL", "PFAM", "MSF", "PIR", "BLC", "Jalview"},\r
+          new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"},\r
           currentFileFormat);\r
 \r
     chooser.setAcceptAllFileFilterUsed(false);\r

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 29eea5f..32297e1 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -181,7 +181,7 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
  {\r
    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
        new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},\r
-       new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview Archive"}\r
+       new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"}\r
        ,null);\r
 \r
    chooser.setFileView(new JalviewFileView());\r

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index c8248ef..e731ddc 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -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