X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=d20b4681c298f9392a6ba18ddf045ad14e6d4b87;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=ed9fb7e5c24fc8b64dcaf39da9058bccefdb6d60;hpb=1889827c44c51f6353fe8619e5d44b421158af23;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index ed9fb7e..d20b468 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -160,43 +160,53 @@ public class FileParse } ; } - + dataIn = new BufferedReader(new FileReader(fileStr)); dataName = fileStr; } return error; } - private BufferedReader tryAsGzipSource(InputStream inputStream) throws Exception + + 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 { errormessage = "URL NOT FOUND"; URL url = new URL(fileStr); // - // GZIPInputStream code borrowed from Aquaria (soon to be open sourced) via Kenny Sabir - Exception e=null; - if (fileStr.toLowerCase().endsWith(".gz")) { - try { - InputStream inputStream = url.openStream(); - dataIn = tryAsGzipSource(inputStream); - dataName = fileStr; - return false; - } catch (Exception ex) { - e=ex; + // GZIPInputStream code borrowed from Aquaria (soon to be open sourced) via + // Kenny Sabir + Exception e = null; + if (fileStr.toLowerCase().endsWith(".gz")) + { + try + { + InputStream inputStream = url.openStream(); + dataIn = tryAsGzipSource(inputStream); + dataName = fileStr; + return false; + } catch (Exception ex) + { + e = ex; } } - try { + try + { dataIn = new BufferedReader(new InputStreamReader(url.openStream())); - } catch (IOException q) { - if (e!=null) + } catch (IOException q) + { + if (e != null) { throw new IOException("Failed to resolve GZIP stream", e); }