X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=7eba5126461b83fcade6030bcfa4dc095044ced0;hb=f0658706f2f846e5f776908b1df18c4d15318008;hp=61f51276475fe41e8f99b39fcaab2981b1897e95;hpb=ef80b989a1f514d58980401ddefffd2c25299ef7;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index 61f5127..7eba512 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -23,9 +23,11 @@ package jalview.io; import jalview.api.AlignExportSettingI; 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. @@ -94,7 +106,7 @@ public class FileParse */ protected String suffix = null; - protected String type = null; + protected DataSourceType dataSourceType = null; protected BufferedReader dataIn = null; @@ -124,9 +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) { @@ -138,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) { @@ -203,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); @@ -241,10 +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; } @@ -278,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; @@ -301,22 +310,49 @@ 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) @@ -325,19 +361,34 @@ public class FileParse { throw new IOException(MessageManager.formatMessage( "exception.problem_opening_file_also_tried", - new String[] { inFile.getName(), suffixLess, - errormessage })); + new String[] + { inFile.getName(), suffixLess, errormessage })); } } else { throw new IOException(MessageManager.formatMessage( - "exception.problem_opening_file", - new String[] { inFile.getName(), errormessage })); + "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.JSToolkit.getFileAsBytes$S(fileStr); + * + */ + + dataIn = new BufferedReader(new java.io.InputStreamReader(new ByteArrayInputStream(bytes))); + dataName = fileStr; + + } + else if (sourceType == DataSourceType.URL) { try { @@ -374,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() @@ -406,7 +457,7 @@ 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) @@ -414,7 +465,8 @@ public class FileParse // 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 })); + new String[] + { errormessage })); } error = false; dataIn.mark(READAHEAD_LIMIT); @@ -445,9 +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 })); } /** @@ -500,9 +552,8 @@ public class FileParse } 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")); } } @@ -613,4 +664,20 @@ public class FileParse } // 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; + } }