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
new SwingJS-site.zip and net.sf.j2s.core.jar
[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
c8e6ad4
..
4d5a2aa
100644
(file)
--- a/
src/jalview/ws/rest/HttpResultSet.java
+++ b/
src/jalview/ws/rest/HttpResultSet.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,9
+23,10
@@
package jalview.ws.rest;
import jalview.bin.Cache;
import jalview.io.FileParse;
import jalview.io.packed.DataProvider;
import jalview.bin.Cache;
import jalview.io.FileParse;
import jalview.io.packed.DataProvider;
+import jalview.io.packed.DataProvider.JvDataType;
import jalview.io.packed.ParsePackedSet;
import jalview.io.packed.SimpleDataProvider;
import jalview.io.packed.ParsePackedSet;
import jalview.io.packed.SimpleDataProvider;
-import jalview.io.packed.DataProvider.JvDataType;
+import jalview.util.MessageManager;
import jalview.ws.io.mime.JalviewMimeContentHandler;
import java.io.BufferedReader;
import jalview.ws.io.mime.JalviewMimeContentHandler;
import java.io.BufferedReader;
@@
-110,8
+111,8
@@
public class HttpResultSet extends FileParse
if (en == null)
{
if (en == null)
{
- throw new Error(
- "Implementation Error: need to have an HttpResponse to process.");
+ throw new Error(MessageManager.getString(
+ "error.implementation_error_need_to_have_httpresponse"));
}
jalview.io.packed.JalviewDataset ds = restJob.newJalviewDataset();
// Decide how we deal with content.
}
jalview.io.packed.JalviewDataset ds = restJob.newJalviewDataset();
// Decide how we deal with content.
@@
-153,8
+154,8
@@
public class HttpResultSet extends FileParse
if (!(en instanceof MultipartEntity))
{
// assume content is simple text stream that can be read from
if (!(en instanceof MultipartEntity))
{
// assume content is simple text stream that can be read from
- String enc = (en.getContentEncoding() == null) ? null : en
- .getContentEncoding().getValue();
+ String enc = (en.getContentEncoding() == null) ? null
+ : en.getContentEncoding().getValue();
if (en.getContentType() != null)
{
Cache.log.debug("Result Type: " + en.getContentType().toString());
if (en.getContentType() != null)
{
Cache.log.debug("Result Type: " + en.getContentType().toString());