X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=de9e6bdd63d70f61249150f2a11f3376225845b9;hb=2a9991ef1eb02d97e9c8ed1644f292117ae6f600;hp=e2cd43a54c7e5f725299a494081c956ce18aca2a;hpb=4660fcf0745dbc1f6f6e7241b398301f93edb548;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index e2cd43a..de9e6bd 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -82,7 +82,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, JSONFile.FILE_DESC, + "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, IdentifyFile.GFF3File, "HTML" }; /** @@ -92,6 +92,7 @@ public class AppletFormatAdapter public static final String[] READABLE_EXTENSIONS = new String[] { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "sto,stk", "xml,rnaml", PhylipFile.FILE_EXT, JSONFile.FILE_EXT, + ".gff2,gff3", "jar,jvp", HtmlFile.FILE_EXT }; /** @@ -100,7 +101,7 @@ public class AppletFormatAdapter */ public static final String[] READABLE_FNAMES = new String[] { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Stockholm", - "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, "Jalview", + "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, IdentifyFile.GFF3File, "Jalview", HtmlFile.FILE_DESC }; /** @@ -310,6 +311,10 @@ public class AppletFormatAdapter { alignFile = new RnamlFile(inFile, type); } + else if (format.equals(IdentifyFile.GFF3File)) + { + alignFile = new Gff3File(inFile, type); + } al = new Alignment(alignFile.getSeqsAsArray()); @@ -433,10 +438,13 @@ public class AppletFormatAdapter { alignFile = new PhylipFile(source); } + else if (format.equals(IdentifyFile.GFF3File)) + { + alignFile = new Gff3File(inFile, type); + } else if (format.equals(JSONFile.FILE_DESC)) { alignFile = new JSONFile(source); - // ((JSONFile) afile).setViewport(viewport); al = new Alignment(alignFile.getSeqsAsArray()); alignFile.addAnnotations(al); alignFile.addSeqGroups(al);