X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=8d2d796ae98cff03a278d8d13c64b99e2b9a73e5;hb=72baa5e02d3f71f1c0259072fdbd0b2bf8250e6c;hp=5f228fb79e3bd7711952f60393a39f3e224196e4;hpb=a853fae4d9d4dbc80e877741c017fca7ee80c59e;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 5f228fb..8d2d796 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -48,6 +48,7 @@ formats.addElement("PileUp"); formats.addElement("PIR"); formats.addElement("PFAM"); + formats.addElement("PDB"); } @@ -57,6 +58,7 @@ public static String CLASSLOADER = "ClassLoader"; AlignFile afile = null; + String inFile; /** * DOCUMENT ME! @@ -70,46 +72,52 @@ public SequenceI[] readFile(String inFile, String type, String format) throws java.io.IOException { + this.inFile = inFile; try { - if (format.equals("FASTA")) - { - afile = new FastaFile(inFile, type); - } - else if (format.equals("MSF")) - { - afile = new MSFfile(inFile, type); - } - else if (format.equals("PileUp")) - { - afile = new PileUpfile(inFile, type); - } - else if (format.equals("CLUSTAL")) - { - afile = new ClustalFile(inFile, type); - } - else if (format.equals("BLC")) - { - afile = new BLCFile(inFile, type); - } - else if (format.equals("PIR")) - { - afile = new PIRFile(inFile, type); - } - else if (format.equals("PFAM")) - { - afile = new PfamFile(inFile, type); - } - else if (format.equals("JnetFile")) - { - afile = new JPredFile(inFile, type); - ((JPredFile)afile).removeNonSequences(); - } + if (format.equals("FASTA")) + { + afile = new FastaFile(inFile, type); + } + else if (format.equals("MSF")) + { + afile = new MSFfile(inFile, type); + } + else if (format.equals("PileUp")) + { + afile = new PileUpfile(inFile, type); + } + else if (format.equals("CLUSTAL")) + { + afile = new ClustalFile(inFile, type); + } + else if (format.equals("BLC")) + { + afile = new BLCFile(inFile, type); + } + else if (format.equals("PIR")) + { + afile = new PIRFile(inFile, type); + } + else if (format.equals("PFAM")) + { + afile = new PfamFile(inFile, type); + } + else if (format.equals("JnetFile")) + { + afile = new JPredFile(inFile, type); + ( (JPredFile) afile).removeNonSequences(); + } + else if (format.equals("PDB")) + { + afile = new MCview.PDBfile(inFile, type); + } - return afile.getSeqsAsArray(); + return afile.getSeqsAsArray(); } catch (Exception e) { + e.printStackTrace(); System.err.println("Failed to read alignment using the '" + format + "' reader.\n"+e);