X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=74fd4224d6da25c5e743eac892d330f4da40e826;hb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;hp=649aad377b3db6361a279762d21b248e061c7a97;hpb=a40bbc57a85658544e2e5d7cc2a7596b762566dc;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 649aad3..74fd422 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -20,14 +20,19 @@ */ package jalview.io; -import jalview.api.AlignViewportI; +import jalview.api.AlignExportSettingI; +import jalview.api.AlignmentViewPanel; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentView; -import jalview.util.MessageManager; +import jalview.datamodel.PDBEntry.Type; +import jalview.datamodel.SequenceI; +import jalview.ext.jmol.JmolParser; +import jalview.structure.StructureImportSettings; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.util.List; @@ -42,110 +47,126 @@ import java.util.List; */ public class AppletFormatAdapter { + private AlignmentViewPanel viewpanel; + /** - * List of valid format strings used in the isValidFormat method + * add jalview-derived non-secondary structure annotation from PDB structure */ - 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, - "HTML" }; + boolean annotFromStructure = false; /** - * List of readable format file extensions by application in order - * corresponding to READABLE_FNAMES + * add secondary structure from PDB data with built-in algorithms + */ + boolean localSecondaryStruct = false; + + /** + * process PDB data with web services + */ + boolean serviceSecondaryStruct = false; + + private AlignmentFileI alignFile = null; + + String inFile; + + /** + * character used to write newlines + */ + protected String newline = System.getProperty("line.separator"); + + private AlignExportSettingI exportSettings; + + /** + * List of valid format strings used in the isValidFormat method */ - 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, - "jar,jvp", "html" }; + // public static final String[] READABLE_FORMATS = new String[] { "BLC", + // "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", "PDB", + // "JnetFile", "RNAML", "PHYLIP", "JSON", + // IdentifyFile.FeaturesFile, "HTML", "mmCIF" }; /** - * List of readable formats by application in order corresponding to - * READABLE_EXTENSIONS + * List of readable format file extensions by application in order + * corresponding to READABLE_FNAMES */ - public static final String[] READABLE_FNAMES = new String[] - { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Stockholm", - "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, "Jalview", "HTML" }; + // public static final String[] READABLE_EXTENSIONS = new String[] { + // "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", + // "sto,stk", "xml,rnaml", "phy", "json", ".gff2,gff3", "jar,jvp", + // "html", "cif" }; + + // + // /** + // * List of readable formats by application in order corresponding to + // * READABLE_EXTENSIONS + // */ + // public static final String[] READABLE_FNAMES = new String[] { "Fasta", + // "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Stockholm", "RNAML", + // "PHYLIP", "JSON", IdentifyFile.FeaturesFile, + // "Jalview", HtmlFile.FILE_DESC, "mmCIF" }; /** * List of valid format strings for use by callers of the formatSequences * method */ - public static final String[] WRITEABLE_FORMATS = new String[] - { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "AMSA", - "STH", PhylipFile.FILE_DESC, JSONFile.FILE_DESC }; + // public static final String[] WRITEABLE_FORMATS = new String[] { "BLC", + // "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "AMSA", "STH", + // "PHYLIP", "JSON" }; /** * List of extensions corresponding to file format types in WRITABLE_FNAMES * that are writable by the application. */ - public static final String[] WRITABLE_EXTENSIONS = new String[] - { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", - "sto,stk", PhylipFile.FILE_EXT, JSONFile.FILE_EXT, "jvp" }; + // public static final String[] WRITABLE_EXTENSIONS = new String[] { + // "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", + // "sto,stk", "phy", "json", "jvp" }; /** * List of writable formats by the application. Order must correspond with the * WRITABLE_EXTENSIONS list of formats. */ - public static final String[] WRITABLE_FNAMES = new String[] - { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "STH", - PhylipFile.FILE_DESC, JSONFile.FILE_DESC, "Jalview" }; + // public static final String[] WRITABLE_FNAMES = new String[] { "Fasta", + // "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "STH", "PHYLIP", + // "JSON", "Jalview" }; public static String INVALID_CHARACTERS = "Contains invalid characters"; // TODO: make these messages dynamic public static String SUPPORTED_FORMATS = "Formats currently supported are\n" - + prettyPrint(READABLE_FORMATS); + + prettyPrint(FileFormat.getReadableFormats()); + + public AppletFormatAdapter() + { + } + + public AppletFormatAdapter(AlignmentViewPanel viewpanel) + { + this.viewpanel = viewpanel; + } + + public AppletFormatAdapter(AlignmentViewPanel alignPanel, + AlignExportSettingI settings) + { + viewpanel = alignPanel; + exportSettings = settings; + } /** - * - * @param els - * @return grammatically correct(ish) list consisting of els elements. + * Formats a grammatically correct(ish) list consisting of the given objects + * + * @param things + * @return */ - public static String prettyPrint(String[] els) + public static String prettyPrint(List things) { StringBuffer list = new StringBuffer(); - for (int i = 0, iSize = els.length - 1; i < iSize; i++) + for (int i = 0, iSize = things.size() - 1; i < iSize; i++) { - list.append(els[i]); + list.append(things.get(i).toString()); list.append(", "); } - list.append(" and " + els[els.length - 1] + "."); + // could i18n 'and' here + list.append(" and " + things.get(things.size() - 1).toString() + "."); return list.toString(); } - public static String FILE = "File"; - - public static String URL = "URL"; - - public static String PASTE = "Paste"; - - public static String CLASSLOADER = "ClassLoader"; - - /** - * add jalview-derived non-secondary structure annotation from PDB structure - */ - boolean annotFromStructure = false; - - /** - * add secondary structure from PDB data with built-in algorithms - */ - boolean localSecondaryStruct = false; - - /** - * process PDB data with web services - */ - boolean serviceSecondaryStruct = false; - - AlignFile afile = null; - - String inFile; - - /** - * character used to write newlines - */ - protected String newline = System.getProperty("line.separator"); - public void setNewlineString(String nl) { newline = nl; @@ -157,170 +178,106 @@ public class AppletFormatAdapter } /** - * check that this format is valid for reading - * - * @param format - * a format string to be compared with READABLE_FORMATS - * @return true if format is readable - */ - public static final boolean isValidFormat(String format) - { - return isValidFormat(format, false); - } - - /** - * validate format is valid for IO - * - * @param format - * a format string to be compared with either READABLE_FORMATS or - * WRITEABLE_FORMATS - * @param forwriting - * when true, format is checked for containment in WRITEABLE_FORMATS - * @return true if format is valid - */ - public static final boolean isValidFormat(String format, - boolean forwriting) - { - boolean valid = false; - String[] format_list = (forwriting) ? WRITEABLE_FORMATS - : READABLE_FORMATS; - for (String element : format_list) - { - if (element.equalsIgnoreCase(format)) - { - return true; - } - } - - return valid; - } - - /** * Constructs the correct filetype parser for a characterised datasource * * @param inFile * data/data location - * @param type + * @param sourceType * type of datasource - * @param format - * File format of data provided by datasource + * @param fileFormat * - * @return DOCUMENT ME! + * @return */ - public Alignment readFile(String inFile, String type, String format) - throws java.io.IOException + public AlignmentI readFile(String file, DataSourceType sourceType, + FileFormatI fileFormat) throws IOException { - // TODO: generalise mapping between format string and io. class instances - // using Constructor.invoke reflection - this.inFile = inFile; + this.inFile = file; 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(); - } - else if (format.equals("PDB")) - { - afile = new MCview.PDBfile(annotFromStructure, - localSecondaryStruct, serviceSecondaryStruct, inFile, type); - // Uncomment to test Jmol data based PDB processing: JAL-1213 - // afile = new jalview.ext.jmol.PDBFileWithJmol(inFile, type); - } - else if (format.equals("STH")) - { - afile = new StockholmFile(inFile, type); - } - else if (format.equals("SimpleBLAST")) - { - afile = new SimpleBlastFile(inFile, type); - } - else if (format.equals(PhylipFile.FILE_DESC)) - { - afile = new PhylipFile(inFile, type); + if (FileFormat.PDB.equals(fileFormat) + || FileFormat.MMCif.equals(fileFormat)) + { + boolean isParseWithJMOL = StructureImportSettings + .getDefaultPDBFileParser().equalsIgnoreCase( + StructureImportSettings.StructureParser.JMOL_PARSER + .toString()); + if (isParseWithJMOL) + { + StructureImportSettings.addSettings(annotFromStructure, + localSecondaryStruct, serviceSecondaryStruct); + alignFile = new JmolParser(inFile, sourceType); + } + else + { + StructureImportSettings.addSettings(annotFromStructure, + localSecondaryStruct, serviceSecondaryStruct); + StructureImportSettings.setShowSeqFeatures(true); + alignFile = new MCview.PDBfile(annotFromStructure, + localSecondaryStruct, serviceSecondaryStruct, inFile, + sourceType); + } + ((StructureFile) alignFile).setDbRefType(FileFormat.PDB + .equals(fileFormat) ? Type.PDB : Type.MMCIF); } - else if (format.equals(JSONFile.FILE_DESC)) - { - afile = new JSONFile(inFile, type); - } - else if (format.equals("RNAML")) + else { - afile = new RnamlFile(inFile, type); - } - - Alignment al = new Alignment(afile.getSeqsAsArray()); - - afile.addAnnotations(al); - afile.addSeqGroups(al); - - return al; + alignFile = fileFormat.getAlignmentFile(inFile, sourceType); + } + // new FastaFile(inFile, sourceType); + // new MSFfile(inFile, sourceType); + // new PileUpfile(inFile, sourceType); + // new ClustalFile(inFile, sourceType); + // new BLCFile(inFile, sourceType); + // new PIRFile(inFile, sourceType); + // new PfamFile(inFile, sourceType); + // alignFile = new JPredFile(inFile, sourceType); + // ((JPredFile) alignFile).removeNonSequences(); + // new StockholmFile(inFile, sourceType); + // new SimpleBlastFile(inFile, sourceType); + // new PhylipFile(inFile, sourceType); + // new JSONFile(inFile, sourceType); + // new HtmlFile(inFile, sourceType); + // new RnamlFile(inFile, sourceType); + // alignFile = new FeaturesFile(true, inFile, sourceType); + return buildAlignmentFromFile(); } catch (Exception e) { e.printStackTrace(); - System.err.println("Failed to read alignment using the '" + format - + "' reader.\n" + e); + System.err.println("Failed to read alignment using the '" + + fileFormat + "' reader.\n" + e); if (e.getMessage() != null && e.getMessage().startsWith(INVALID_CHARACTERS)) { - throw new java.io.IOException(e.getMessage()); + throw new IOException(e.getMessage()); } // Finally test if the user has pasted just the sequence, no id - if (type.equalsIgnoreCase("Paste")) + if (sourceType == DataSourceType.PASTE) { try { // Possible sequence is just residues with no label - afile = new FastaFile(">UNKNOWN\n" + inFile, "Paste"); - Alignment al = new Alignment(afile.getSeqsAsArray()); - - afile.addSeqGroups(al); - afile.addAnnotations(al); - return al; + alignFile = new FastaFile(">UNKNOWN\n" + inFile, + DataSourceType.PASTE); + return buildAlignmentFromFile(); } catch (Exception ex) { if (ex.toString().startsWith(INVALID_CHARACTERS)) { - throw new java.io.IOException(e.getMessage()); + throw new IOException(e.getMessage()); } ex.printStackTrace(); } } - - // If we get to this stage, the format was not supported - throw new java.io.IOException(SUPPORTED_FORMATS); + if (FileFormat.Html.equals(fileFormat)) + { + throw new IOException(e.getMessage()); + } } + throw new FileFormatException(SUPPORTED_FORMATS); } /** @@ -331,83 +288,40 @@ public class AppletFormatAdapter * @param format * File format of data that will be provided by datasource * - * @return DOCUMENT ME! + * @return */ - public AlignmentI readFromFile(FileParse source, String format) - throws java.io.IOException + public AlignmentI readFromFile(FileParse source, FileFormatI format) + throws IOException { - // TODO: generalise mapping between format string and io. class instances - // using Constructor.invoke reflection - // This is exactly the same as the readFile method except we substitute - // 'inFile, type' with 'source' this.inFile = source.getInFile(); - String type = source.type; + DataSourceType type = source.dataSourceType; try { - if (format.equals("FASTA")) + if (FileFormat.PDB.equals(format) || FileFormat.MMCif.equals(format)) { - afile = new FastaFile(source); - } - else if (format.equals("MSF")) - { - afile = new MSFfile(source); - } - else if (format.equals("PileUp")) - { - afile = new PileUpfile(source); - } - else if (format.equals("CLUSTAL")) - { - afile = new ClustalFile(source); - } - else if (format.equals("BLC")) - { - afile = new BLCFile(source); - } - else if (format.equals("PIR")) - { - afile = new PIRFile(source); - } - else if (format.equals("PFAM")) - { - afile = new PfamFile(source); - } - else if (format.equals("JnetFile")) - { - afile = new JPredFile(source); - ((JPredFile) afile).removeNonSequences(); - } - else if (format.equals("PDB")) - { - afile = new MCview.PDBfile(annotFromStructure, - localSecondaryStruct, serviceSecondaryStruct, source); - } - else if (format.equals("STH")) - { - afile = new StockholmFile(source); - } - else if (format.equals("RNAML")) - { - afile = new RnamlFile(source); - } - else if (format.equals("SimpleBLAST")) - { - afile = new SimpleBlastFile(source); + // TODO obtain config value from preference settings + boolean isParseWithJMOL = false; + if (isParseWithJMOL) + { + StructureImportSettings.addSettings(annotFromStructure, + localSecondaryStruct, serviceSecondaryStruct); + alignFile = new JmolParser(source); + } + else + { + StructureImportSettings.setShowSeqFeatures(true); + alignFile = new MCview.PDBfile(annotFromStructure, + localSecondaryStruct, serviceSecondaryStruct, source); + } + ((StructureFile) alignFile).setDbRefType(Type.PDB); } - else if (format.equals(PhylipFile.FILE_DESC)) + else { - afile = new PhylipFile(source); + alignFile = format.getAlignmentFile(source); } - else if (format.equals(JSONFile.FILE_DESC)) - { - afile = new JSONFile(source); - } - Alignment al = new Alignment(afile.getSeqsAsArray()); - afile.addAnnotations(al); - afile.addSeqGroups(al); + return buildAlignmentFromFile(); - return al; } catch (Exception e) { e.printStackTrace(); @@ -417,26 +331,24 @@ public class AppletFormatAdapter if (e.getMessage() != null && e.getMessage().startsWith(INVALID_CHARACTERS)) { - throw new java.io.IOException(e.getMessage()); + throw new FileFormatException(e.getMessage()); } // Finally test if the user has pasted just the sequence, no id - if (type.equalsIgnoreCase("Paste")) + if (type == DataSourceType.PASTE) { try { // Possible sequence is just residues with no label - afile = new FastaFile(">UNKNOWN\n" + inFile, "Paste"); - Alignment al = new Alignment(afile.getSeqsAsArray()); - afile.addAnnotations(al); - afile.addSeqGroups(al); - return al; + alignFile = new FastaFile(">UNKNOWN\n" + inFile, + DataSourceType.PASTE); + return buildAlignmentFromFile(); } catch (Exception ex) { if (ex.toString().startsWith(INVALID_CHARACTERS)) { - throw new java.io.IOException(e.getMessage()); + throw new IOException(e.getMessage()); } ex.printStackTrace(); @@ -444,27 +356,48 @@ public class AppletFormatAdapter } // If we get to this stage, the format was not supported - throw new java.io.IOException(SUPPORTED_FORMATS); + throw new FileFormatException(SUPPORTED_FORMATS); } } + /** + * boilerplate method to handle data from an AlignFile and construct a new + * alignment or import to an existing alignment + * + * @return AlignmentI instance ready to pass to a UI constructor + */ + private AlignmentI buildAlignmentFromFile() + { + // Standard boilerplate for creating alignment from parser + // alignFile.configureForView(viewpanel); + + AlignmentI al = new Alignment(alignFile.getSeqsAsArray()); + + alignFile.addAnnotations(al); + + alignFile.addGroups(al); + + return al; + } /** * create an alignment flatfile from a Jalview alignment view + * * @param format * @param jvsuffix * @param av * @param selectedOnly * @return flatfile in a string */ - public String formatSequences(String format, boolean jvsuffix, - AlignViewportI av, boolean selectedOnly) + public String formatSequences(FileFormatI format, boolean jvsuffix, + AlignmentViewPanel ap, boolean selectedOnly) { - AlignmentView selvew = av.getAlignmentView(selectedOnly, false); - AlignmentI aselview = selvew.getVisibleAlignment(av + AlignmentView selvew = ap.getAlignViewport().getAlignmentView( + selectedOnly, false); + AlignmentI aselview = selvew.getVisibleAlignment(ap.getAlignViewport() .getGapCharacter()); - List ala = (av + List ala = (ap.getAlignViewport() .getVisibleAlignmentAnnotation(selectedOnly)); if (ala != null) { @@ -473,7 +406,7 @@ public class AppletFormatAdapter aselview.addAnnotation(aa); } } - + viewpanel = ap; return formatSequences(format, aselview, jvsuffix); } @@ -492,87 +425,31 @@ public class AppletFormatAdapter * * @return alignment flat file contents */ - public String formatSequences(String format, AlignmentI alignment, + public String formatSequences(FileFormatI format, AlignmentI alignment, boolean jvsuffix) { try { - AlignFile afile = null; - if (format.equalsIgnoreCase("FASTA")) - { - afile = new FastaFile(); - } - else if (format.equalsIgnoreCase("MSF")) - { - afile = new MSFfile(); - } - else if (format.equalsIgnoreCase("PileUp")) - { - afile = new PileUpfile(); - } - else if (format.equalsIgnoreCase("CLUSTAL")) - { - afile = new ClustalFile(); - } - else if (format.equalsIgnoreCase("BLC")) - { - afile = new BLCFile(); - } - else if (format.equalsIgnoreCase("PIR")) - { - afile = new PIRFile(); - } - else if (format.equalsIgnoreCase("PFAM")) - { - afile = new PfamFile(); - } - else if (format.equalsIgnoreCase("STH")) - { - afile = new StockholmFile(alignment); - } - else if (format.equalsIgnoreCase("AMSA")) - { - afile = new AMSAFile(alignment); - } - else if (format.equalsIgnoreCase(PhylipFile.FILE_DESC)) - { - afile = new PhylipFile(); - } - else if (format.equalsIgnoreCase(JSONFile.FILE_DESC)) - { - afile = new JSONFile(); - // Add groups to AlignFile - afile.seqGroups = alignment.getGroups(); - - // Add non auto calculated annotation to AlignFile - for (AlignmentAnnotation annot : alignment.getAlignmentAnnotation()) - { - if (annot != null && !annot.autoCalculated) - { - if (annot.label.equals("PDB.CATempFactor")) - { - continue; - } - afile.annotations.add(annot); - } - } - } - else if (format.equalsIgnoreCase("RNAML")) + AlignmentFileI afile = format.getAlignmentFile(alignment); + + afile.setNewlineString(newline); + afile.setExportSettings(exportSettings); + afile.configureForView(viewpanel); + + // check whether we were given a specific alignment to export, rather than + // the one in the viewpanel + SequenceI[] seqs = null; + if (viewpanel == null || viewpanel.getAlignment() == null + || viewpanel.getAlignment() != alignment) { - afile = new RnamlFile(); + seqs = alignment.getSequencesArray(); } - else { - throw new Exception(MessageManager.getString("error.implementation_error_unknown_file_format_string")); + seqs = viewpanel.getAlignment().getSequencesArray(); } - afile.setNewlineString(newline); - afile.addJVSuffix(jvsuffix); - afile.setSeqs(alignment.getSequencesArray()); - - - String afileresp = afile.print(); + String afileresp = afile.print(seqs, jvsuffix); if (afile.hasWarningMessage()) { System.err.println("Warning raised when writing as " + format @@ -589,14 +466,14 @@ public class AppletFormatAdapter return null; } - public static String checkProtocol(String file) + public static DataSourceType checkProtocol(String file) { - String protocol = FILE; + DataSourceType protocol = DataSourceType.FILE; String ft = file.toLowerCase().trim(); if (ft.indexOf("http:") == 0 || ft.indexOf("https:") == 0 || ft.indexOf("file:") == 0) { - protocol = URL; + protocol = DataSourceType.URL; } return protocol; } @@ -617,8 +494,10 @@ public class AppletFormatAdapter System.gc(); long memf = -r.totalMemory() + r.freeMemory(); long t1 = -System.currentTimeMillis(); - Alignment al = afa.readFile(args[i], FILE, - new IdentifyFile().Identify(args[i], FILE)); + AlignmentI al = afa + .readFile(args[i], DataSourceType.FILE, + new IdentifyFile().identify(args[i], + DataSourceType.FILE)); t1 += System.currentTimeMillis(); System.gc(); memf += r.totalMemory() - r.freeMemory(); @@ -629,11 +508,11 @@ public class AppletFormatAdapter try { System.out.println(new AppletFormatAdapter().formatSequences( - "FASTA", al, true)); + FileFormat.Fasta, al, true)); } catch (Exception e) { System.err - .println("Couln't format the alignment for output as a FASTA file."); + .println("Couln't format the alignment for output as a FASTA file."); e.printStackTrace(System.err); } } @@ -643,8 +522,8 @@ public class AppletFormatAdapter } System.out.println("Read took " + (t1 / 1000.0) + " seconds."); System.out - .println("Difference between free memory now and before is " - + (memf / (1024.0 * 1024.0) * 1.0) + " MB"); + .println("Difference between free memory now and before is " + + (memf / (1024.0 * 1024.0) * 1.0) + " MB"); } catch (Exception e) { System.err.println("Exception when dealing with " + i @@ -668,16 +547,17 @@ public class AppletFormatAdapter * @param format * @return protocol that yields the data parsable as the given type */ - public static String resolveProtocol(String file, String format) + public static DataSourceType resolveProtocol(String file, + FileFormatI format) { return resolveProtocol(file, format, false); } - public static String resolveProtocol(String file, String format, - boolean debug) + public static DataSourceType resolveProtocol(String file, + FileFormatI format, boolean debug) { // TODO: test thoroughly! - String protocol = null; + DataSourceType protocol = null; if (debug) { System.out.println("resolving datasource started with:\n>>file\n" @@ -701,26 +581,25 @@ public class AppletFormatAdapter System.err.println("Resource '" + file + "' was " + (rtn ? "" : "not") + " located by classloader."); } - ; if (rtn) { - protocol = AppletFormatAdapter.CLASSLOADER; + protocol = DataSourceType.CLASSLOADER; } } catch (Exception ex) { System.err - .println("Exception checking resources: " + file + " " + ex); + .println("Exception checking resources: " + file + " " + ex); } if (file.indexOf("://") > -1) { - protocol = AppletFormatAdapter.URL; + protocol = DataSourceType.URL; } else { // skipping codebase prepend check. - protocol = AppletFormatAdapter.FILE; + protocol = DataSourceType.FILE; } FileParse fp = null; try @@ -756,7 +635,7 @@ public class AppletFormatAdapter { System.out.println("Accessing as paste."); } - protocol = AppletFormatAdapter.PASTE; + protocol = DataSourceType.PASTE; fp = null; try { @@ -776,7 +655,7 @@ public class AppletFormatAdapter { return null; } - if (format == null || format.length() == 0) + if (format == null) { return protocol; } @@ -784,8 +663,7 @@ public class AppletFormatAdapter { try { - String idformat = new jalview.io.IdentifyFile().Identify(file, - protocol); + FileFormatI idformat = new IdentifyFile().identify(file, protocol); if (idformat == null) { if (debug) @@ -812,7 +690,7 @@ public class AppletFormatAdapter if (debug) { System.out - .println("File deemed not accessible via " + protocol); + .println("File deemed not accessible via " + protocol); } fp.close(); return null; @@ -824,10 +702,13 @@ public class AppletFormatAdapter System.err.println("File deemed not accessible via " + protocol); e.printStackTrace(); } - ; - } } return null; } + + public AlignmentFileI getAlignFile() + { + return alignFile; + } }