X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=690e22ace03ea44a5e5feb45ad67c0f3d7acf09c;hb=294cc8b0cf3d28310a95e1ffdb2a0f871304b70d;hp=f155e51060aee132894a0ece6949aa5fb23784d1;hpb=7e257a47edaa3762753f5566bc3fcb2522719542;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index f155e51..690e22a 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,10 +20,21 @@ */ package jalview.io; +import jalview.api.AlignExportSettingI; +import jalview.api.AlignViewportI; import jalview.util.MessageManager; -import java.io.*; -import java.net.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.net.MalformedURLException; +import java.net.URL; import java.util.zip.GZIPInputStream; /** @@ -39,7 +50,13 @@ public class FileParse public File inFile = null; + private AlignViewportI viewport; + public int index = 1; // sequence counter for FileParse object created from + /** + * specific settings for exporting data from the current context + */ + private AlignExportSettingI exportSettings; // same data source @@ -99,7 +116,9 @@ public class FileParse throw new Error(MessageManager.getString("error.implementation_error_null_fileparse")); } if (from == this) + { return; + } index = ++from.index; inFile = from.inFile; suffixSeparator = from.suffixSeparator; @@ -281,7 +300,9 @@ public class FileParse { checkURLSource(fileStr); if (suffixSeparator == '#') + { extractSuffix(fileStr); // URL lref is stored for later reference. + } } catch (IOException e) { String suffixLess = extractSuffix(fileStr); @@ -323,7 +344,9 @@ public class FileParse { String suffixLess = extractSuffix(fileStr); if (suffixLess != null) + { is = getClass().getResourceAsStream("/" + suffixLess); + } } if (is != null) { @@ -371,7 +394,9 @@ public class FileParse public String nextLine() throws IOException { if (!error) + { return dataIn.readLine(); + } throw new IOException(MessageManager.formatMessage("exception.invalid_source_stream", new String[]{errormessage})); } @@ -471,4 +496,33 @@ public class FileParse } return null; } + + public AlignViewportI getViewport() + { + return viewport; + } + + public void setViewport(AlignViewportI viewport) + { + this.viewport = viewport; + } + + /** + * @return the currently configured exportSettings for writing data. + */ + public AlignExportSettingI getExportSettings() + { + return exportSettings; + } + + /** + * Set configuration for export of data. + * + * @param exportSettings + * the exportSettings to set + */ + public void setExportSettings(AlignExportSettingI exportSettings) + { + this.exportSettings = exportSettings; + } }