X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2FHttpResultSet.java;h=7ecbd273adf7abc37a1005012ce878a5bcd86018;hb=89fdf2b589aadf46000d58306e0b50dc9ef1af74;hp=fddc4e30aef05f25e95722d24f71fb4f5f034e12;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java index fddc4e3..7ecbd27 100644 --- a/src/jalview/ws/rest/HttpResultSet.java +++ b/src/jalview/ws/rest/HttpResultSet.java @@ -1,20 +1,20 @@ -/******************************************************************************* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle - * +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * * 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 . - *******************************************************************************/ + */ package jalview.ws.rest; import jalview.bin.Cache; @@ -37,7 +37,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; /** @@ -96,6 +95,7 @@ public class HttpResultSet extends FileParse /** * parses the results of the service output. + * * @return the result of ParsePackedSet.getAlignment() * @throws Exception * @throws Error @@ -220,9 +220,10 @@ public class HttpResultSet extends FileParse */ public String getUrl() { - try { + try + { return cachedRequest.getURI().toURL().toString(); - } catch (Exception x) + } catch (Exception x) { x.printStackTrace(); return null;