JAL-1713 update from Jalview 2.11.3 develop

[jalview.git] / src / jalview / io / FileParse.java

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index 5fd33be..d3a6ba9 100755 (executable)
--- 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();