From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 28 Jan 2014 14:59:40 +0000 (+0000)
Subject: Merge branch 'JAL-957_jbake' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~11
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=91bf03e63f6cd4fdb7ed120a8acafc49247d59ba;hp=e1720311b72967752dd545fa9ddadac366c969db;p=jalview.git

Merge branch 'JAL-957_jbake' into Release_2_8_Branch
---

diff --git a/build.xml b/build.xml
index 83425ce..ad1b781 100755
--- a/build.xml
+++ b/build.xml
@@ -350,6 +350,7 @@
     <!--
 				<association mime-type="application-x/ext-file" extensions="fa"/>
         <association mime-type="application-x/ext-file" extensions="fasta"/>
+        <association mime-type="application-x/ext-file" extensions="mfa"/>
         <association mime-type="application-x/ext-file" extensions="fastq"/>
         <association mime-type="application-x/ext-file" extensions="blc"/>
         <association mime-type="application-x/ext-file" extensions="msf"/>
diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index 67d50ee..0a47a19 100755
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -53,7 +53,7 @@ public class AppletFormatAdapter
    * that are writable by the application.
    */
   public static final String[] WRITABLE_EXTENSIONS = new String[]
-  { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
+  { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
       "sto,stk" };
 
   /**
@@ -69,7 +69,7 @@ public class AppletFormatAdapter
    * corresponding to READABLE_FNAMES
    */
   public static final String[] READABLE_EXTENSIONS = new String[]
-  { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
+  { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
       "sto,stk" }; // ,
 
   // ".blast"