X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fparadise%2FAnnotate3D.java;h=d50ad878f1b1857666001ba4f500aac466c77416;hb=b513684c725997c77341f30ce4e584cf9f7cdfed;hp=b34f89f43a92907a2f4288613bb53d1e0a7a0a2e;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git

diff --git a/src/jalview/ext/paradise/Annotate3D.java b/src/jalview/ext/paradise/Annotate3D.java
index b34f89f..d50ad87 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.9.0b2)
- * Copyright (C) 2015 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.
  * 
@@ -45,13 +45,20 @@ import org.json.simple.parser.ParseException;
  * 
  * @author jimp
  * 
- *         History: v1.0 revised from original due to refactoring of
- *         paradise-ubmc.u-strasbg.fr/webservices/annotate3d to
- *         http://arn-ibmc.in2p3.fr/api/compute/2d?tool=rnaview
+ * @version v1.0 revised from original due to refactoring of
+ *          paradise-ubmc.u-strasbg.fr/webservices/annotate3d to
+ *          http://arn-ibmc.in2p3.fr/api/compute/2d?tool=rnaview <br/>
+ *          See also testing URL from fjossinet:<br/>
+ *          http://charn2-ibmc.u-strasbg.fr:8080/api/compute/2d <br/>
+ *          If in doubt, check against the REST client at:
+ *          https://github.com/fjossinet/RNA-Science
+ *          -Toolbox/blob/master/pyrna/restclient.py
  */
 public class Annotate3D
 {
-  private static String twoDtoolsURL = "http://arn-ibmc.in2p3.fr/api/compute/2d";
+  // also test with
+  // "http://charn2-ibmc.u-strasbg.fr:8080/api/compute/2d";
+  private static String twoDtoolsURL = "http://arn-ibmc.in2p3.fr/api/compute/2d?tool=rnaview";
 
   private static ContentHandler createContentHandler()
   {
@@ -87,8 +94,8 @@ public class Annotate3D
       }
 
       @Override
-      public boolean startObjectEntry(String key) throws ParseException,
-              IOException
+      public boolean startObjectEntry(String key)
+              throws ParseException, IOException
       {
         // TODO Auto-generated method stub
         return false;
@@ -116,8 +123,8 @@ public class Annotate3D
       }
 
       @Override
-      public boolean primitive(Object value) throws ParseException,
-              IOException
+      public boolean primitive(Object value)
+              throws ParseException, IOException
       {
         // TODO Auto-generated method stub
         return false;
@@ -137,8 +144,8 @@ public class Annotate3D
     // return processJsonResponseFor(HttpClientUtils.doHttpUrlPost(twoDtoolsURL,
     // vals));
     ArrayList<Reader> readers = new ArrayList<Reader>();
-    final BufferedReader postResponse = HttpClientUtils.doHttpUrlPost(
-            twoDtoolsURL, vals, 0, 0);
+    final BufferedReader postResponse = HttpClientUtils
+            .doHttpUrlPost(twoDtoolsURL, vals, 0, 0);
     readers.add(postResponse);
     return readers.iterator();
 
@@ -176,15 +183,15 @@ public class Annotate3D
           ;
           if (sval == null)
           {
-            System.err
-                    .println("DEVELOPER WARNING: Annotate3d didn't return a '2D' tag in its response. Consider checking output of server. Response was :"
+            System.err.println(
+                    "DEVELOPER WARNING: Annotate3d didn't return a '2D' tag in its response. Consider checking output of server. Response was :"
                             + val.toString());
 
             sval = "";
           }
-          return new StringReader(
-                  (sval instanceof JSONObject) ? ((JSONObject) sval)
-                          .toString() : sval.toString());
+          return new StringReader((sval instanceof JSONObject)
+                  ? ((JSONObject) sval).toString()
+                  : sval.toString());
 
         }
 
@@ -221,9 +228,8 @@ public class Annotate3D
       };
     } catch (Exception foo)
     {
-      throw new Exception(
-              MessageManager
-                      .getString("exception.couldnt_parse_responde_from_annotated3d_server"),
+      throw new Exception(MessageManager.getString(
+              "exception.couldnt_parse_responde_from_annotated3d_server"),
               foo);
     }