X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;fp=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=204e3eb618651ce04ac7c04ab07dc7f300555fdb;hb=c0501eaa85c0594f9275766f64de8ea44a59c368;hp=8414da5d78ac2a17eda45752462f9b06d1c49f3d;hpb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;p=jalview.git diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java index 8414da5..204e3eb 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; @@ -43,6 +43,7 @@ import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.util.EntityUtils; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.parser.MimeStreamParser; + /** * data source instantiated from the response of an httpclient request. * @@ -130,7 +131,7 @@ public class HttpResultSet extends FileParse implements AutoCloseable { error = true; errormessage = "Couldn't parse message from web service."; - Cache.log.warn("Failed to parse MIME multipart content", me); + Console.warn("Failed to parse MIME multipart content", me); EntityUtils.consume(en); } return new ParsePackedSet().getAlignment(ds, @@ -157,19 +158,19 @@ public class HttpResultSet extends FileParse implements AutoCloseable : en.getContentEncoding().getValue(); if (en.getContentType() != null) { - Cache.log.debug("Result Type: " + en.getContentType().toString()); + Console.debug("Result Type: " + en.getContentType().toString()); } else { - Cache.log.debug("No Result Type Specified."); + Console.debug("No Result Type Specified."); } if (enc == null || enc.length() < 1) { - Cache.log.debug("Assuming 'Default' Result Encoding."); + Console.debug("Assuming 'Default' Result Encoding."); } else { - Cache.log.debug("Result Encoded as : " + enc); + Console.debug("Result Encoded as : " + enc); } // attempt to identify file and construct an appropriate DataSource // identifier for it. @@ -183,7 +184,7 @@ public class HttpResultSet extends FileParse implements AutoCloseable : new InputStreamReader(en.getContent()); } catch (UnsupportedEncodingException e) { - Cache.log.error("Can't handle encoding '" + enc + Console.error("Can't handle encoding '" + enc + "' for response from webservice.", e); EntityUtils.consume(en); error = true;