X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=e34093dc836fcf6e2b7de7dbb14bb7f21b982411;hb=9b3219d225131af5a165553f206ebf8da304ee23;hp=b235bcc5e80ec25680427b9906e5d5125cc361a0;hpb=6dd554fdbf34db6b79595d5027159d20225f4894;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index b235bcc..e34093d 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -26,10 +26,10 @@ import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentView; -import jalview.gui.AlignmentPanel; import jalview.util.MessageManager; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.util.List; @@ -83,52 +83,51 @@ public class AppletFormatAdapter /** * List of valid format strings used in the isValidFormat method */ - 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, IdentifyFile.GFF3File, - "HTML" }; + 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, + IdentifyFile.FeaturesFile, "HTML" }; /** * List of readable format file extensions by application in order * corresponding to READABLE_FNAMES */ - public static final String[] READABLE_EXTENSIONS = new String[] - { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", + 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 }; + ".gff2,gff3", "jar,jvp", HtmlFile.FILE_EXT }; /** * 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", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, IdentifyFile.GFF3File, "Jalview", - HtmlFile.FILE_DESC }; + public static final String[] READABLE_FNAMES = new String[] { "Fasta", + "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Stockholm", "RNAML", + PhylipFile.FILE_DESC, JSONFile.FILE_DESC, IdentifyFile.FeaturesFile, + "Jalview", HtmlFile.FILE_DESC }; /** * 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", + PhylipFile.FILE_DESC, JSONFile.FILE_DESC }; /** * 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", + 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" }; /** * 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", + 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 String INVALID_CHARACTERS = "Contains invalid characters"; @@ -146,7 +145,7 @@ public class AppletFormatAdapter this.viewpanel = viewpanel; } - public AppletFormatAdapter(AlignmentPanel alignPanel, + public AppletFormatAdapter(AlignmentViewPanel alignPanel, AlignExportSettingI settings) { viewpanel = alignPanel; @@ -170,7 +169,6 @@ public class AppletFormatAdapter return list.toString(); } - public void setNewlineString(String nl) { newline = nl; @@ -206,6 +204,10 @@ public class AppletFormatAdapter public static final boolean isValidFormat(String format, boolean forwriting) { + if (format == null) + { + return false; + } boolean valid = false; String[] format_list = (forwriting) ? WRITEABLE_FORMATS : READABLE_FORMATS; @@ -304,9 +306,9 @@ public class AppletFormatAdapter { alignFile = new RnamlFile(inFile, type); } - else if (format.equals(IdentifyFile.GFF3File)) + else if (format.equals(IdentifyFile.FeaturesFile)) { - alignFile = new Gff3File(inFile, type); + alignFile = new FeaturesFile(true, inFile, type); } return buildAlignmentFrom(alignFile); } catch (Exception e) @@ -340,7 +342,10 @@ public class AppletFormatAdapter ex.printStackTrace(); } } - + if (format.equalsIgnoreCase("HTML")) + { + throw new IOException(e.getMessage()); + } // If we get to this stage, the format was not supported throw new java.io.IOException(SUPPORTED_FORMATS); } @@ -421,9 +426,10 @@ public class AppletFormatAdapter { alignFile = new PhylipFile(source); } - else if (format.equals(IdentifyFile.GFF3File)) + else if (format.equals(IdentifyFile.FeaturesFile)) { - alignFile = new Gff3File(inFile, type); + // enforce 'parseImmediately' here: + alignFile = new FeaturesFile(true, inFile, type); } else if (format.equals(JSONFile.FILE_DESC)) { @@ -473,7 +479,6 @@ public class AppletFormatAdapter } } - /** * boilerplate method to handle data from an AlignFile and construct a new * alignment or import to an existing alignment @@ -484,7 +489,7 @@ public class AppletFormatAdapter private AlignmentI buildAlignmentFrom(AlignFile alignFile2) { // Standard boilerplate for creating alignment from parser - alignFile.configureForView(viewpanel); + // alignFile.configureForView(viewpanel); AlignmentI al = new Alignment(alignFile.getSeqsAsArray()); @@ -497,6 +502,7 @@ public class AppletFormatAdapter /** * create an alignment flatfile from a Jalview alignment view + * * @param format * @param jvsuffix * @param av @@ -520,7 +526,7 @@ public class AppletFormatAdapter aselview.addAnnotation(aa); } } - + viewpanel = ap; return formatSequences(format, aselview, jvsuffix); } @@ -585,10 +591,10 @@ public class AppletFormatAdapter { afile = new PhylipFile(); } - else if (format.equalsIgnoreCase(JSONFile.FILE_DESC)) - { + else if (format.equalsIgnoreCase(JSONFile.FILE_DESC)) + { afile = new JSONFile(); - } + } else if (format.equalsIgnoreCase("RNAML")) { afile = new RnamlFile(); @@ -596,13 +602,14 @@ public class AppletFormatAdapter else { - throw new Exception(MessageManager.getString("error.implementation_error_unknown_file_format_string")); + throw new Exception( + MessageManager + .getString("error.implementation_error_unknown_file_format_string")); } + afile.setNewlineString(newline); afile.addJVSuffix(jvsuffix); - afile.setExportSettings(exportSettings); - afile.configureForView(viewpanel); // check whether we were given a specific alignment to export, rather than @@ -663,7 +670,7 @@ public class AppletFormatAdapter long memf = -r.totalMemory() + r.freeMemory(); long t1 = -System.currentTimeMillis(); AlignmentI al = afa.readFile(args[i], FILE, - new IdentifyFile().Identify(args[i], FILE)); + new IdentifyFile().identify(args[i], FILE)); t1 += System.currentTimeMillis(); System.gc(); memf += r.totalMemory() - r.freeMemory(); @@ -678,7 +685,7 @@ public class AppletFormatAdapter } 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); } } @@ -688,8 +695,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 @@ -755,7 +762,7 @@ public class AppletFormatAdapter } catch (Exception ex) { System.err - .println("Exception checking resources: " + file + " " + ex); + .println("Exception checking resources: " + file + " " + ex); } if (file.indexOf("://") > -1) @@ -829,7 +836,7 @@ public class AppletFormatAdapter { try { - String idformat = new jalview.io.IdentifyFile().Identify(file, + String idformat = new jalview.io.IdentifyFile().identify(file, protocol); if (idformat == null) { @@ -857,7 +864,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;