JAL-1260 file formats and IdentifyFile updates for GenBank and ENA

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

diff --git a/src/jalview/io/FileFormat.java b/src/jalview/io/FileFormat.java
index 4f0480d..1d240b2 100644 (file)
--- a/src/jalview/io/FileFormat.java
+++ b/src/jalview/io/FileFormat.java
@@ -20,14 +20,14 @@
  */
 package jalview.io;
 
+import java.io.IOException;
+
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefSource;
 import jalview.datamodel.PDBEntry;
 import jalview.ext.jmol.JmolParser;
 import jalview.structure.StructureImportSettings;
 
-import java.io.IOException;
-
 public enum FileFormat implements FileFormatI
 {
   Fasta("Fasta", "fa, fasta, mfa, fastq", true, true)
@@ -244,7 +244,22 @@ public enum FileFormat implements FileFormatI
       return new PhylipFile();
     }
   },
-  GenBank("GenBank/ENA Flatfile","gb",false,false)
+  GenBank("GenBank Flatfile", "gb", true, false)
+  {
+    @Override
+    public AlignmentFileReaderI getReader(FileParse source)
+            throws IOException
+    {
+      return new GenBankFile(source, "GenBank");
+    }
+
+    @Override
+    public AlignmentFileWriterI getWriter(AlignmentI al)
+    {
+      return null;
+    }
+  },
+  Embl("ENA Flatfile", "txt", true, false)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -253,13 +268,13 @@ public enum FileFormat implements FileFormatI
       // Always assume we import from EMBL for now
       return new EmblFlatFile(source, DBRefSource.EMBL);
     }
+
     @Override
     public AlignmentFileWriterI getWriter(AlignmentI al)
     {
       return null;
     }
-  }
-  ,
+  },
   Jnet("JnetFile", "", false, false)
   {
     @Override