X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=ee242386383f0233c473181525308eecaef645ec;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=d2dc8f333485eea9311ab2c56747c6b9ddc33b71;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index d2dc8f3..ee24238 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -1,24 +1,24 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.io; import java.io.File; +import java.io.InputStream; import jalview.datamodel.*; @@ -38,7 +38,7 @@ public class AppletFormatAdapter */ public static final String[] READABLE_FORMATS = new String[] { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", - "PDB", "JnetFile" }; + "PDB", "JnetFile" }; // , "SimpleBLAST" }; /** * List of valid format strings for use by callers of the formatSequences @@ -66,14 +66,22 @@ 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, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar", + "sto" }; // , + + // ".blast" + // }; /** * 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", "Jalview" }; + { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview", + "Stockholm" };// , + + // "SimpleBLAST" + // }; public static String INVALID_CHARACTERS = "Contains invalid characters"; @@ -114,7 +122,7 @@ public class AppletFormatAdapter * check that this format is valid for reading * * @param format - * a format string to be compared with READABLE_FORMATS + * a format string to be compared with READABLE_FORMATS * @return true if format is readable */ public static final boolean isValidFormat(String format) @@ -126,11 +134,10 @@ public class AppletFormatAdapter * validate format is valid for IO * * @param format - * a format string to be compared with either READABLE_FORMATS - * or WRITEABLE_FORMATS + * 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 + * when true, format is checked for containment in WRITEABLE_FORMATS * @return true if format is valid */ public static final boolean isValidFormat(String format, @@ -154,11 +161,11 @@ public class AppletFormatAdapter * Constructs the correct filetype parser for a characterised datasource * * @param inFile - * data/data location + * data/data location * @param type - * type of datasource + * type of datasource * @param format - * File format of data provided by datasource + * File format of data provided by datasource * * @return DOCUMENT ME! */ @@ -211,6 +218,10 @@ public class AppletFormatAdapter { afile = new StockholmFile(inFile, type); } + else if (format.equals("SimpleBLAST")) + { + afile = new SimpleBlastFile(inFile, type); + } Alignment al = new Alignment(afile.getSeqsAsArray()); @@ -260,9 +271,9 @@ public class AppletFormatAdapter * Constructs the correct filetype parser for an already open datasource * * @param source - * an existing datasource + * an existing datasource * @param format - * File format of data that will be provided by datasource + * File format of data that will be provided by datasource * * @return DOCUMENT ME! */ @@ -318,6 +329,10 @@ public class AppletFormatAdapter { afile = new StockholmFile(source); } + else if (format.equals("SimpleBLAST")) + { + afile = new SimpleBlastFile(source); + } Alignment al = new Alignment(afile.getSeqsAsArray()); @@ -364,15 +379,17 @@ public class AppletFormatAdapter } /** - * Construct an output class for an alignment in a particular filetype + * Construct an output class for an alignment in a particular filetype TODO: + * allow caller to detect errors and warnings encountered when generating + * output * * @param format - * string name of alignment format + * string name of alignment format * @param alignment - * the alignment to be written out + * the alignment to be written out * @param jvsuffix - * passed to AlnFile class controls whether /START-END is added - * to sequence names + * passed to AlnFile class controls whether /START-END is added to + * sequence names * * @return alignment flat file contents */ @@ -429,7 +446,13 @@ public class AppletFormatAdapter afile.setSeqs(alignment.getSequencesArray()); - return afile.print(); + String afileresp = afile.print(); + if (afile.hasWarningMessage()) + { + System.err.println("Warning raised when writing as " + format + + " : " + afile.getWarningMessage()); + } + return afileresp; } catch (Exception e) { System.err.println("Failed to write alignment as a '" + format @@ -456,8 +479,8 @@ 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)); + Alignment al = afa.readFile(args[i], FILE, + new IdentifyFile().Identify(args[i], FILE)); t1 += System.currentTimeMillis(); System.gc(); memf += r.totalMemory() - r.freeMemory(); @@ -465,6 +488,16 @@ public class AppletFormatAdapter { System.out.println("Alignment contains " + al.getHeight() + " sequences and " + al.getWidth() + " columns."); + try + { + System.out.println(new AppletFormatAdapter().formatSequences( + "FASTA", al, true)); + } catch (Exception e) + { + System.err + .println("Couln't format the alignment for output as a FASTA file."); + e.printStackTrace(System.err); + } } else { @@ -488,6 +521,173 @@ public class AppletFormatAdapter } i++; } + } + + /** + * try to discover how to access the given file as a valid datasource that + * will be identified as the given type. + * + * @param file + * @param format + * @return protocol that yields the data parsable as the given type + */ + public static String resolveProtocol(String file, String format) + { + return resolveProtocol(file, format, false); + } + + public static String resolveProtocol(String file, String format, + boolean debug) + { + // TODO: test thoroughly! + String protocol = null; + if (debug) + { + System.out.println("resolving datasource started with:\n>>file\n" + + file + ">>endfile"); + } + + // This might throw a security exception in certain browsers + // Netscape Communicator for instance. + try + { + boolean rtn = false; + InputStream is = System.getSecurityManager().getClass() + .getResourceAsStream("/" + file); + if (is != null) + { + rtn = true; + is.close(); + } + if (debug) + { + System.err.println("Resource '" + file + "' was " + + (rtn ? "" : "not") + " located by classloader."); + } + ; + if (rtn) + { + protocol = AppletFormatAdapter.CLASSLOADER; + } + + } catch (Exception ex) + { + System.err + .println("Exception checking resources: " + file + " " + ex); + } + + if (file.indexOf("://") > -1) + { + protocol = AppletFormatAdapter.URL; + } + else + { + // skipping codebase prepend check. + protocol = AppletFormatAdapter.FILE; + } + FileParse fp = null; + try + { + if (debug) + { + System.out.println("Trying to get contents of resource as " + + protocol + ":"); + } + fp = new FileParse(file, protocol); + if (!fp.isValid()) + { + fp = null; + } else { + if (debug) + { + System.out.println("Successful."); + }} + } catch (Exception e) + { + if (debug) + { + System.err.println("Exception when accessing content: " + e); + } + fp = null; + } + if (fp == null) + { + if (debug) + { + System.out.println("Accessing as paste."); + } + protocol = AppletFormatAdapter.PASTE; + fp = null; + try + { + fp = new FileParse(file, protocol); + if (!fp.isValid()) + { + fp = null; + } + } catch (Exception e) + { + System.err.println("Failed to access content as paste!"); + e.printStackTrace(); + fp = null; + } + } + if (fp == null) + { + return null; + } + if (format == null || format.length() == 0) + { + return protocol; + } + else + { + try + { + String idformat = new jalview.io.IdentifyFile().Identify(file, + protocol); + if (idformat == null) + { + if (debug) + { + System.out.println("Format not identified. Inaccessible file."); + } + return null; + } + if (debug) + { + System.out.println("Format identified as " + idformat + + "and expected as " + format); + } + if (idformat.equals(format)) + { + if (debug) + { + System.out.println("Protocol identified as " + protocol); + } + return protocol; + } + else + { + if (debug) + { + System.out + .println("File deemed not accessible via " + protocol); + } + fp.close(); + return null; + } + } catch (Exception e) + { + if (debug) + { + System.err.println("File deemed not accessible via " + protocol); + e.printStackTrace(); + } + ; + } + } + return null; } }