git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' of https...
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
HttpResultSet.java
diff --git
a/src/jalview/ws/rest/HttpResultSet.java
b/src/jalview/ws/rest/HttpResultSet.java
index
bff39c1
..
bd2f664
100644
(file)
--- a/
src/jalview/ws/rest/HttpResultSet.java
+++ b/
src/jalview/ws/rest/HttpResultSet.java
@@
-20,7
+20,7
@@
*/
package jalview.ws.rest;
*/
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;
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.";
{
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,
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)
{
: en.getContentEncoding().getValue();
if (en.getContentType() != null)
{
- Cache.debug("Result Type: " + en.getContentType().toString());
+ Console.debug("Result Type: " + en.getContentType().toString());
}
else
{
}
else
{
- Cache.debug("No Result Type Specified.");
+ Console.debug("No Result Type Specified.");
}
if (enc == null || enc.length() < 1)
{
}
if (enc == null || enc.length() < 1)
{
- Cache.debug("Assuming 'Default' Result Encoding.");
+ Console.debug("Assuming 'Default' Result Encoding.");
}
else
{
}
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.
}
// 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)
{
: 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;
+ "' for response from webservice.", e);
en.consumeContent();
error = true;