Merge branch 'patch/JAL-4281_idwidthandannotHeight_in_project' into develop

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

diff --git a/src/jalview/io/FileFormat.java b/src/jalview/io/FileFormat.java
index a743694..91ce527 100644 (file)
--- a/src/jalview/io/FileFormat.java
+++ b/src/jalview/io/FileFormat.java
@@ -30,7 +30,7 @@ import jalview.structure.StructureImportSettings;
 
 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)
@@ -92,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)
@@ -244,7 +244,7 @@ public enum FileFormat implements FileFormatI
       return new PhylipFile();
     }
   },
-  GenBank("GenBank Flatfile", "gb, gbk", true, false)
+  GenBank("GenBank Flatfile", "gb,gbk", true, false)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -308,6 +308,21 @@ 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
@@ -379,7 +394,7 @@ public enum FileFormat implements FileFormatI
       return true;
     }
   },
-  Jalview("Jalview", "jvp, jar", true, true)
+  Jalview("Jalview", "jvp,jar", true, true)
   {
     @Override
     public AlignmentFileReaderI getReader(FileParse source)
@@ -439,8 +454,11 @@ public enum FileFormat implements FileFormatI
    * @param shortName
    * @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
+   * @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)