X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;fp=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=2e947820f3523ef0a140b84cef5457370606b304;hb=68c26e8852772be21fdb5b091fa9083d8cdb6eec;hp=efddab361167cd6841c7aa0ecd9406441a6b88af;hpb=a5ae12c17739ea531cf9aacc712fff8444765cd7;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index efddab3..2e94782 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -47,7 +47,7 @@ public class AppletFormatAdapter */ public static final String[] READABLE_FORMATS = new String[] { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", - "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, HtmlFile.FILE_DESC }; // , + "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, "HTML" }; // , // "SimpleBLAST" // }; @@ -82,7 +82,7 @@ public class AppletFormatAdapter public static final String[] READABLE_EXTENSIONS = new String[] { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar,jvp", "sto,stk", "xml,rnaml", PhylipFile.FILE_EXT, - HtmlFile.FILE_EXT }; // ".blast" + "html" }; // ".blast" /** * List of readable formats by application in order corresponding to @@ -90,7 +90,7 @@ public class AppletFormatAdapter */ public static final String[] READABLE_FNAMES = new String[] { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview", - "Stockholm", "RNAML", PhylipFile.FILE_DESC, HtmlFile.FILE_DESC };// , + "Stockholm", "RNAML", PhylipFile.FILE_DESC, "HTML" };// , // "SimpleBLAST" // }; @@ -255,10 +255,10 @@ public class AppletFormatAdapter { afile = new PhylipFile(inFile, type); } - else if (format.equals(HtmlFile.FILE_DESC)) - { - afile = new HtmlFile(inFile, type); - } + // else if (format.equals(HtmlFile.FILE_DESC)) + // { + // afile = new HtmlFile(inFile, type); + // } else if (format.equals("RNAML")) { afile = new RnamlFile(inFile, type); @@ -382,10 +382,10 @@ public class AppletFormatAdapter { afile = new PhylipFile(source); } - else if (format.equals(HtmlFile.FILE_DESC)) - { - afile = new HtmlFile(source); - } + // else if (format.equals(HtmlFile.FILE_DESC)) + // { + // afile = new HtmlFile(source); + // } Alignment al = new Alignment(afile.getSeqsAsArray()); afile.addAnnotations(al); @@ -521,10 +521,10 @@ public class AppletFormatAdapter { afile = new PhylipFile(); } - else if (format.equalsIgnoreCase(HtmlFile.FILE_DESC)) - { - afile = new HtmlFile(); - } + // else if (format.equalsIgnoreCase(HtmlFile.FILE_DESC)) + // { + // afile = new HtmlFile(); + // } else if (format.equalsIgnoreCase("RNAML")) { afile = new RnamlFile();