X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=d3a6ba936b86c3f65feaa7bc165995e4e31575ae;hb=4cf91ec17ae81e5f4be97aacfb171e70add999c3;hp=5fd33be4f50228a2db09d273629a5efc0bad2165;hpb=1b10059cdf8b6a85fddd86a2a3c6588be3257c22;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index 5fd33be..d3a6ba9 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -41,7 +41,7 @@ import jalview.api.AlignExportSettingsI; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureSettingsModelI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.util.MessageManager; import jalview.util.Platform; @@ -225,7 +225,7 @@ public class FileParse { if (!input.markSupported()) { - Cache.log.error( + Console.error( "FileParse.izGzipStream: input stream must support mark/reset"); return false; } @@ -343,7 +343,7 @@ public class FileParse } String encoding = _conn.getContentEncoding(); String contentType = _conn.getContentType(); - boolean isgzipped = "application/x-gzip".equalsIgnoreCase(contentType) + boolean isgzipped = "application/x-gzip".equalsIgnoreCase(contentType) || contentType.endsWith("gzip") || "gzip".equals(encoding); Exception e = null; InputStream inputStream = _conn.getInputStream();