X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=4d5a2aab9b084e986d155952ca9b78b0803f5c7b;hb=c78840385a5ac9dd6d16a37aa7b55cfaeb360456;hp=24e917426c011fc262ff1c624055cfcb181f7718;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java index 24e9174..4d5a2aa 100644 --- 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.2b1) - * 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. * @@ -23,9 +23,9 @@ 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; @@ -111,7 +111,8 @@ public class HttpResultSet extends FileParse if (en == null) { - throw new Error(MessageManager.getString("error.implementation_error_need_to_have_httpresponse")); + 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. @@ -153,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());