From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 20 May 2005 07:55:26 +0000 (+0000)
Subject: Fasta FASTA
X-Git-Tag: Release_2_0~270
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c72aef50d0ab104b28b24e28ec1ccb48073a09d5;p=jalview.git

Fasta FASTA
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 300be96..3302fff 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -65,7 +65,7 @@ public class AlignFrame extends GAlignFrame
   {
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")
         ,  new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},
-          new String[]{"FASTA", "CLUSTAL", "PFAM", "MSF", "PIR", "BLC", "Jalview"},
+          new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"},
           currentFileFormat);
 
     chooser.setAcceptAllFileFilterUsed(false);
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 29eea5f..32297e1 100755
--- 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));
  {
    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
        new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},
-       new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview Archive"}
+       new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"}
        ,null);
 
    chooser.setFileView(new JalviewFileView());
diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index c8248ef..e731ddc 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -52,19 +52,20 @@ public class JalviewFileChooser extends JFileChooser
   {
 
     String format = getFileFilter().getDescription();
-    if (format.startsWith("Jalview"))
+
+    if (format.toUpperCase().startsWith("JALVIEW"))
       format = "Jalview";
-    else if (format.startsWith("Fasta"))
+    else if (format.toUpperCase().startsWith("FASTA"))
       format = "FASTA";
-    else if (format.startsWith("MSF"))
+    else if (format.toUpperCase().startsWith("MSF"))
       format = "MSF";
-    else if (format.startsWith("Clustal"))
+    else if (format.toUpperCase().startsWith("CLUSTAL"))
       format = "CLUSTAL";
-    else if (format.startsWith("BLC"))
+    else if (format.toUpperCase().startsWith("BLC"))
       format = "BLC";
-    else if (format.startsWith("PIR"))
+    else if (format.toUpperCase().startsWith("PIR"))
       format = "PIR";
-    else if (format.startsWith("PFAM"))
+    else if (format.toUpperCase().startsWith("PFAM"))
       format = "PFAM";
 
     return format;