X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=e4360c42f3d644f99c250004241ea1ab368f2011;hb=e309b8d9bd62fb304fdd612c7385e76027d2f2d7;hp=1c87196d9ca35fc2db7f744a4fa60164b951595b;hpb=abafb63247a48540fcbf5b2927b9ed3b7443404f;p=jalview.git diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java index 1c87196..e4360c4 100644 --- a/src/jalview/ws/rest/HttpResultSet.java +++ b/src/jalview/ws/rest/HttpResultSet.java @@ -1,3 +1,23 @@ +/* + * 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. + * + * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.ws.rest; import jalview.bin.Cache; @@ -6,6 +26,7 @@ import jalview.io.packed.DataProvider; 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; @@ -20,7 +41,6 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.mime.MultipartEntity; import org.apache.james.mime4j.MimeException; -import org.apache.james.mime4j.parser.ContentHandler; import org.apache.james.mime4j.parser.MimeStreamParser; /** @@ -79,6 +99,7 @@ public class HttpResultSet extends FileParse /** * parses the results of the service output. + * * @return the result of ParsePackedSet.getAlignment() * @throws Exception * @throws Error @@ -90,8 +111,7 @@ 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. @@ -197,4 +217,20 @@ public class HttpResultSet extends FileParse super.finalize(); } + /** + * + * @return the URL that this result set read data from. + */ + public String getUrl() + { + try + { + return cachedRequest.getURI().toURL().toString(); + } catch (Exception x) + { + x.printStackTrace(); + return null; + } + } + }