X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fparadise%2FAnnotate3D.java;h=b34f89f43a92907a2f4288613bb53d1e0a7a0a2e;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=80b2ab83ebb993727ab3271a33b360f59411368c;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/ext/paradise/Annotate3D.java b/src/jalview/ext/paradise/Annotate3D.java index 80b2ab8..b34f89f 100644 --- a/src/jalview/ext/paradise/Annotate3D.java +++ b/src/jalview/ext/paradise/Annotate3D.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -23,13 +23,13 @@ package jalview.ext.paradise; import jalview.util.MessageManager; import jalview.ws.HttpClientUtils; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; import java.net.URL; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -37,7 +37,6 @@ import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.json.simple.JSONStreamAware; import org.json.simple.parser.ContentHandler; import org.json.simple.parser.ParseException; @@ -138,7 +137,9 @@ public class Annotate3D // return processJsonResponseFor(HttpClientUtils.doHttpUrlPost(twoDtoolsURL, // vals)); ArrayList readers = new ArrayList(); - readers.add(HttpClientUtils.doHttpUrlPost(twoDtoolsURL, vals)); + final BufferedReader postResponse = HttpClientUtils.doHttpUrlPost( + twoDtoolsURL, vals, 0, 0); + readers.add(postResponse); return readers.iterator(); } @@ -190,14 +191,16 @@ public class Annotate3D @Override public void remove() { - throw new Error(MessageManager.getString("error.not_implemented_remove")); + throw new Error( + MessageManager.getString("error.not_implemented_remove")); } @Override protected Object clone() throws CloneNotSupportedException { - throw new CloneNotSupportedException(MessageManager.getString("error.not_implemented_clone")); + throw new CloneNotSupportedException( + MessageManager.getString("error.not_implemented_clone")); } @Override @@ -218,7 +221,10 @@ public class Annotate3D }; } catch (Exception foo) { - throw new Exception(MessageManager.getString("exception.couldnt_parse_responde_from_annotated3d_server"), foo); + throw new Exception( + MessageManager + .getString("exception.couldnt_parse_responde_from_annotated3d_server"), + foo); } }