X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=4d5a2aab9b084e986d155952ca9b78b0803f5c7b;hb=7c70de6dbc24545b9da5aac77896220d15394fb9;hp=7a3a04e9fec34593d9309e09a3df4c37b1f1d35d;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java
index 7a3a04e..4d5a2aa 100644
--- a/src/jalview/ws/rest/HttpResultSet.java
+++ b/src/jalview/ws/rest/HttpResultSet.java
@@ -1,19 +1,21 @@
/*
- * 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.rest;
@@ -21,9 +23,10 @@ package jalview.ws.rest;
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.DataProvider.JvDataType;
+import jalview.util.MessageManager;
import jalview.ws.io.mime.JalviewMimeContentHandler;
import java.io.BufferedReader;
@@ -108,8 +111,8 @@ public class HttpResultSet extends FileParse
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.
@@ -151,8 +154,8 @@ public class HttpResultSet extends FileParse
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());