X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileFormat.java;h=91ce5275d5ff3366296eadf9dc4c55a6e8d8fac3;hb=4222d402b5bd51649d38c3818e8429b786c230be;hp=a11147c069c17570d168b52572df3422763a1070;hpb=6a39c322e12aa5b9a14e240e19df8d6be814e594;p=jalview.git

diff --git a/src/jalview/io/FileFormat.java b/src/jalview/io/FileFormat.java
index a11147c..91ce527 100644
--- a/src/jalview/io/FileFormat.java
+++ b/src/jalview/io/FileFormat.java
@@ -1,15 +1,36 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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)
+  Fasta("Fasta", "fa,fasta,mfa,fastq", true, true)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -71,7 +92,7 @@ public enum FileFormat implements FileFormatI
       return new PIRFile();
     }
   },
-  BLC("BLC", "BLC", true, true)
+  BLC("BLC", "blc", true, true)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -223,6 +244,37 @@ public enum FileFormat implements FileFormatI
       return new PhylipFile();
     }
   },
+  GenBank("GenBank Flatfile", "gb,gbk", 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)
+            throws IOException
+    {
+      // 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
@@ -256,6 +308,36 @@ public enum FileFormat implements FileFormatI
       return new FeaturesFile();
     }
   },
+  FeatureSettings("Jalview Feature Settings File","fc",false,false)
+  {
+    @Override
+    public AlignmentFileReaderI getReader(FileParse source)
+            throws IOException
+    {
+      return null;
+    }
+
+    @Override
+    public AlignmentFileWriterI getWriter(AlignmentI al)
+    {
+      return null;
+    }    
+  },
+  ScoreMatrix("Substitution matrix", "", false, false)
+  {
+    @Override
+    public AlignmentFileReaderI getReader(FileParse source)
+            throws IOException
+    {
+      return new ScoreMatrixFile(source);
+    }
+
+    @Override
+    public AlignmentFileWriterI getWriter(AlignmentI al)
+    {
+      return null;
+    }
+  },
   PDB("PDB", "pdb,ent", true, false)
   {
     @Override
@@ -271,7 +353,7 @@ public enum FileFormat implements FileFormatI
       else
       {
         StructureImportSettings.setShowSeqFeatures(true);
-        return new MCview.PDBfile(
+        return new mc_view.PDBfile(
                 StructureImportSettings.isVisibleChainAnnotation(),
                 StructureImportSettings.isProcessSecondaryStructure(),
                 StructureImportSettings.isExternalSecondaryStructure(),
@@ -312,7 +394,7 @@ public enum FileFormat implements FileFormatI
       return true;
     }
   },
-  Jalview("Jalview", "jar,jvp", true, true)
+  Jalview("Jalview", "jvp,jar", true, true)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -336,7 +418,7 @@ public enum FileFormat implements FileFormatI
     @Override
     public boolean isIdentifiable()
     {
-      return false;
+      return true;
     }
   };
 
@@ -373,7 +455,10 @@ public enum FileFormat implements FileFormatI
    * @param extensions
    *          comma-separated list of file extensions associated with the format
    * @param isReadable
+   *          - can be recognised by IdentifyFile and imported with the given
+   *          reader
    * @param isWritable
+   *          - can be exported with the returned writer
    */
   private FileFormat(String shortName, String extensions,
           boolean isReadable, boolean isWritable)