this was supposed to go on a separate branch. Didn't know I had to be

sure I was synchronized.

diff --git a/src/jalview/io/FileFormat.java b/src/jalview/io/FileFormat.java
index df76c61..cb61740 100644 (file)
--- a/src/jalview/io/FileFormat.java
+++ b/src/jalview/io/FileFormat.java
@@ -29,21 +29,6 @@ import java.io.IOException;
 
 public enum FileFormat implements FileFormatI
 {
-  BSML("BSML", "bbb", true, false)
-  {
-    @Override
-    public AlignmentFileReaderI getReader(FileParse source)
-            throws IOException
-    {
-      return new BSMLFile(source);
-    }
-
-    @Override
-    public AlignmentFileWriterI getWriter(AlignmentI al)
-    {
-      return null;
-    }
-  },
   Fasta("Fasta", "fa, fasta, mfa, fastq", true, true)
   {
     @Override

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index 384797e..b312474 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -165,8 +165,8 @@ public class IdentifyFile
           if (source.inFile != null)
           {
             String fileStr = source.inFile.getName();
-            if (fileStr.contains(".jar") || fileStr.contains(".zip")
-                    || fileStr.contains(".jvp"))
+            if (fileStr.contains(".jar")
+                    || fileStr.contains(".zip") || fileStr.contains(".jvp"))
             {
               // possibly a Jalview archive (but check further)
               reply = FileFormat.Jalview;
@@ -319,11 +319,6 @@ public class IdentifyFile
         if ((lessThan > -1)) // possible Markup Language data i.e HTML,
                              // RNAML, XML
         {
-          if (data.startsWith("<BSML>"))
-          {
-            reply = FileFormat.BSML;
-            break;
-          }
           String upper = data.toUpperCase();
           if (upper.substring(lessThan).startsWith("<HTML"))
           {