Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

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

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index d3a6ba9..1f51d8c 100755 (executable)
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -343,8 +343,8 @@ public class FileParse
     }
     String encoding = _conn.getContentEncoding();
     String contentType = _conn.getContentType();
-    boolean isgzipped = "application/x-gzip".equalsIgnoreCase(contentType) || contentType.endsWith("gzip")
-            || "gzip".equals(encoding);
+    boolean isgzipped = "application/x-gzip".equalsIgnoreCase(contentType)
+            || contentType.endsWith("gzip") || "gzip".equals(encoding);
     Exception e = null;
     InputStream inputStream = _conn.getInputStream();
     if (isgzipped)
@@ -380,7 +380,7 @@ public class FileParse
     if (sfpos > -1 && sfpos < fileStr.length() - 1)
     {
       suffix = fileStr.substring(sfpos + 1);
-      // System.err.println("DEBUG: Found Suffix:"+suffix);
+      // jalview.bin.Console.errPrintln("DEBUG: Found Suffix:"+suffix);
       return fileStr.substring(0, sfpos);
     }
     return null;
@@ -634,7 +634,7 @@ public class FileParse
   {
     if (bytesRead >= READAHEAD_LIMIT)
     {
-      System.err.println(String.format(
+      jalview.bin.Console.errPrintln(String.format(
               "File reset error: read %d bytes but reset limit is %d",
               bytesRead, READAHEAD_LIMIT));
     }