X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fparadise%2FAnnotate3D.java;h=885945eaaf284af94c408a4db4f2f71f64dcebb7;hb=9876fdccf311378e690c1f9e18db52675d427b89;hp=48420332b5d3190d3bc1353dd54d74ac6415afcd;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/ext/paradise/Annotate3D.java b/src/jalview/ext/paradise/Annotate3D.java index 4842033..885945e 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 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -20,15 +20,16 @@ */ 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; @@ -36,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; @@ -137,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(); } @@ -189,14 +191,16 @@ public class Annotate3D @Override public void remove() { - throw new Error("Remove: Not implemented"); + throw new Error( + MessageManager.getString("error.not_implemented_remove")); } @Override protected Object clone() throws CloneNotSupportedException { - throw new CloneNotSupportedException("Clone: Not implemented"); + throw new CloneNotSupportedException( + MessageManager.getString("error.not_implemented_clone")); } @Override @@ -218,7 +222,9 @@ public class Annotate3D } catch (Exception foo) { throw new Exception( - "Couldn't parse response from Annotate3d server.", foo); + MessageManager + .getString("exception.couldnt_parse_responde_from_annotated3d_server"), + foo); } }