X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=bd2f6649e5e18ab6d545e4f26c8bf581c706d964;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=bff39c1982b130e8f8e49ae2bed25956d52a4b19;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java index bff39c1..bd2f664 100644 --- a/src/jalview/ws/rest/HttpResultSet.java +++ b/src/jalview/ws/rest/HttpResultSet.java @@ -20,7 +20,7 @@ */ package jalview.ws.rest; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.io.FileParse; import jalview.io.packed.DataProvider; import jalview.io.packed.DataProvider.JvDataType; @@ -131,7 +131,7 @@ public class HttpResultSet extends FileParse implements AutoCloseable { error = true; errormessage = "Couldn't parse message from web service."; - Cache.warn("Failed to parse MIME multipart content", me); + Console.warn("Failed to parse MIME multipart content", me); en.consumeContent(); } return new ParsePackedSet().getAlignment(ds, @@ -158,19 +158,19 @@ public class HttpResultSet extends FileParse implements AutoCloseable : en.getContentEncoding().getValue(); if (en.getContentType() != null) { - Cache.debug("Result Type: " + en.getContentType().toString()); + Console.debug("Result Type: " + en.getContentType().toString()); } else { - Cache.debug("No Result Type Specified."); + Console.debug("No Result Type Specified."); } if (enc == null || enc.length() < 1) { - Cache.debug("Assuming 'Default' Result Encoding."); + Console.debug("Assuming 'Default' Result Encoding."); } else { - Cache.debug("Result Encoded as : " + enc); + Console.debug("Result Encoded as : " + enc); } // attempt to identify file and construct an appropriate DataSource // identifier for it. @@ -184,7 +184,7 @@ public class HttpResultSet extends FileParse implements AutoCloseable : new InputStreamReader(en.getContent()); } catch (UnsupportedEncodingException e) { - Cache.error("Can't handle encoding '" + enc + Console.error("Can't handle encoding '" + enc + "' for response from webservice.", e); en.consumeContent(); error = true;