X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=809bc8f2d13a3ebb9b48877c8cfc9b41a377b314;hb=c9a98f3738fa773afd01ea5d5881b604855fa1b8;hp=22213122bd40ac32ae525a526eca28b4082d05a8;hpb=fbed706fbf25c2f7a5b3f3ba9b2b44737c411dcc;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index 2221312..809bc8f 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -20,12 +20,14 @@ */ package jalview.io; -import jalview.api.AlignExportSettingI; +import jalview.api.AlignExportSettingsI; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; +import jalview.api.FeatureSettingsModelI; import jalview.util.MessageManager; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileReader; @@ -44,6 +46,10 @@ import java.util.zip.GZIPInputStream; */ public class FileParse { + protected static final String SPACE = " "; + + protected static final String TAB = "\t"; + /** * text specifying source of data. usually filename or url. */ @@ -51,6 +57,12 @@ public class FileParse public File inFile = null; + private byte[] bytes; // from JavaScript + + public byte[] getBytes() + { + return bytes; + } /** * a viewport associated with the current file operation. May be null. May * move to different object. @@ -60,7 +72,7 @@ public class FileParse /** * specific settings for exporting data from the current context */ - private AlignExportSettingI exportSettings; + private AlignExportSettingsI exportSettings; /** * sequence counter for FileParse object created from same data source @@ -80,7 +92,7 @@ public class FileParse public void setNewlineString(String nl) { - newline = nl; + newline = nl; } public String getNewlineString() @@ -94,11 +106,11 @@ public class FileParse */ protected String suffix = null; - protected String type = null; + protected DataSourceType dataSourceType = null; protected BufferedReader dataIn = null; - protected String errormessage = "UNITIALISED SOURCE"; + protected String errormessage = "UNINITIALISED SOURCE"; protected boolean error = true; @@ -124,7 +136,8 @@ public class FileParse { if (from == null) { - throw new Error(MessageManager.getString("error.implementation_error_null_fileparse")); + throw new Error(MessageManager + .getString("error.implementation_error_null_fileparse")); } if (from == this) { @@ -136,7 +149,7 @@ public class FileParse suffix = from.suffix; errormessage = from.errormessage; // inherit potential error messages error = false; // reset any error condition. - type = from.type; + dataSourceType = from.dataSourceType; dataIn = from.dataIn; if (dataIn != null) { @@ -201,16 +214,16 @@ public class FileParse private BufferedReader tryAsGzipSource(InputStream inputStream) throws Exception { - BufferedReader inData = new BufferedReader(new InputStreamReader( - new GZIPInputStream(inputStream))); + BufferedReader inData = new BufferedReader( + new InputStreamReader(new GZIPInputStream(inputStream))); inData.mark(2048); inData.read(); inData.reset(); return inData; } - private boolean checkURLSource(String fileStr) throws IOException, - MalformedURLException + private boolean checkURLSource(String fileStr) + throws IOException, MalformedURLException { errormessage = "URL NOT FOUND"; URL url = new URL(fileStr); @@ -239,7 +252,8 @@ public class FileParse { if (e != null) { - throw new IOException(MessageManager.getString("exception.failed_to_resolve_gzip_stream"), e); + throw new IOException(MessageManager + .getString("exception.failed_to_resolve_gzip_stream"), e); } throw q; } @@ -273,9 +287,9 @@ public class FileParse * configurable values for the origin and the type of the source */ public FileParse(BufferedReader source, String originString, - String typeString) + DataSourceType sourceType) { - type = typeString; + dataSourceType = sourceType; error = false; inFile = null; dataName = originString; @@ -296,38 +310,85 @@ public class FileParse * Create a datasource for input to Jalview. See AppletFormatAdapter for the * types of sources that are handled. * - * @param fileStr - * - datasource locator/content - * @param type + * @param file + * - datasource locator/content as File or String + * @param sourceType * - protocol of source * @throws MalformedURLException * @throws IOException */ - public FileParse(String fileStr, String type) + public FileParse(Object file, DataSourceType sourceType) throws MalformedURLException, IOException { - this.type = type; + if (file instanceof File) + { + parse((File) file, ((File) file).getPath(), sourceType, true); + } + else + { + parse(null, file.toString(), sourceType, false); + } + } + + private void parse(File file, String fileStr, DataSourceType sourceType, + boolean isFileObject) throws MalformedURLException, IOException + { + /** + * @j2sNative + * + * this.bytes = file && file._bytes; + * + */ + this.dataSourceType = sourceType; error = false; - if (type.equals(AppletFormatAdapter.FILE)) + if (sourceType == DataSourceType.FILE) { - if (checkFileSource(fileStr)) + + if (bytes != null) + { + // this will be from JavaScript + inFile = file; + dataIn = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes))); + dataName = fileStr; + } + else if (checkFileSource(fileStr)) { String suffixLess = extractSuffix(fileStr); if (suffixLess != null) { if (checkFileSource(suffixLess)) { - throw new IOException(MessageManager.formatMessage("exception.problem_opening_file_also_tried", new String[]{inFile.getName(),suffixLess,errormessage})); + throw new IOException(MessageManager.formatMessage( + "exception.problem_opening_file_also_tried", + new String[] + { inFile.getName(), suffixLess, errormessage })); } } else { - throw new IOException(MessageManager.formatMessage("exception.problem_opening_file", new String[]{inFile.getName(),errormessage})); + throw new IOException(MessageManager.formatMessage( + "exception.problem_opening_file", new String[] + { inFile.getName(), errormessage })); } } } - else if (type.equals(AppletFormatAdapter.URL)) + else if (sourceType == DataSourceType.RELATIVE_URL) + { + /** + * BH 2018 hack for no support for access-origin + * + * @j2sNative + * + * this.bytes = swingjs.JSUtil.getFileAsBytes$O(fileStr); + * + */ + + dataIn = new BufferedReader(new java.io.InputStreamReader(new ByteArrayInputStream(bytes))); + dataName = fileStr; + + } + else if (sourceType == DataSourceType.URL) { try { @@ -335,7 +396,7 @@ public class FileParse { checkURLSource(fileStr); if (suffixSeparator == '#') - { + { extractSuffix(fileStr); // URL lref is stored for later reference. } } catch (IOException e) @@ -364,13 +425,13 @@ public class FileParse error = true; } } - else if (type.equals(AppletFormatAdapter.PASTE)) + else if (sourceType == DataSourceType.PASTE) { errormessage = "PASTE INACCESSIBLE!"; dataIn = new BufferedReader(new StringReader(fileStr)); dataName = "Paste"; } - else if (type.equals(AppletFormatAdapter.CLASSLOADER)) + else if (sourceType == DataSourceType.CLASSLOADER) { errormessage = "RESOURCE CANNOT BE LOCATED"; java.io.InputStream is = getClass() @@ -396,13 +457,16 @@ public class FileParse else { errormessage = "PROBABLE IMPLEMENTATION ERROR : Datasource Type given as '" - + (type != null ? type : "null") + "'"; + + (sourceType != null ? sourceType : "null") + "'"; error = true; } if (dataIn == null || error) { // pass up the reason why we have no source to read from - throw new IOException(MessageManager.formatMessage("exception.failed_to_read_data_from_source", new String[]{errormessage})); + throw new IOException(MessageManager.formatMessage( + "exception.failed_to_read_data_from_source", + new String[] + { errormessage })); } error = false; dataIn.mark(READAHEAD_LIMIT); @@ -422,7 +486,8 @@ public class FileParse } else { - throw new IOException(MessageManager.getString("exception.no_init_source_stream")); + throw new IOException( + MessageManager.getString("exception.no_init_source_stream")); } } @@ -432,7 +497,9 @@ public class FileParse { return dataIn.readLine(); } - throw new IOException(MessageManager.formatMessage("exception.invalid_source_stream", new String[]{errormessage})); + throw new IOException(MessageManager + .formatMessage("exception.invalid_source_stream", new String[] + { errormessage })); } /** @@ -466,18 +533,27 @@ public class FileParse } /** - * rewinds the datasource the beginning. + * Rewinds the datasource to the marked point if possible + * + * @param bytesRead * */ - public void reset() throws IOException + public void reset(int bytesRead) throws IOException { + if (bytesRead >= READAHEAD_LIMIT) + { + System.err.println(String.format( + "File reset error: read %d bytes but reset limit is %d", + bytesRead, READAHEAD_LIMIT)); + } if (dataIn != null && !error) { dataIn.reset(); } else { - throw new IOException(MessageManager.getString("error.implementation_error_reset_called_for_invalid_source")); + throw new IOException(MessageManager.getString( + "error.implementation_error_reset_called_for_invalid_source")); } } @@ -558,7 +634,7 @@ public class FileParse /** * @return the currently configured exportSettings for writing data. */ - public AlignExportSettingI getExportSettings() + public AlignExportSettingsI getExportSettings() { return exportSettings; } @@ -569,7 +645,7 @@ public class FileParse * @param exportSettings * the exportSettings to set */ - public void setExportSettings(AlignExportSettingI exportSettings) + public void setExportSettings(AlignExportSettingsI exportSettings) { this.exportSettings = exportSettings; } @@ -582,9 +658,26 @@ public class FileParse */ public void configureForView(AlignmentViewPanel avpanel) { - if (avpanel!=null) { + if (avpanel != null) + { setViewport(avpanel.getAlignViewport()); } // could also set export/import settings } + + /** + * Returns the preferred feature colour configuration if there is one, else + * null + * + * @return + */ + public FeatureSettingsModelI getFeatureColourScheme() + { + return null; + } + + public DataSourceType getDataSourceType() + { + return dataSourceType; + } }