Merge branch 'features/JAL-1596ChimeraREST' into develop

[jalview.git] / src / ext / edu / ucsf / rbvi / strucviz2 / ChimeraManager.java

diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
index a76c7e0..b45404e 100644 (file)
--- a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
@@ -27,15 +27,15 @@ import ext.edu.ucsf.rbvi.strucviz2.port.ListenerThreads;
  */
 public class ChimeraManager
 {
-  private static final boolean debug = true;
+  private static final boolean debug = false;
 
   /*
    * true: use REST API (recommended), false: use stdout/stdin (deprecated)
    */
+  // TODO remove once definitely happy with using REST
   private static final boolean USE_REST = true;
 
-  // Port number for Chimera REST service
-  private int restPort;
+  private int chimeraRestPort;
 
   private Process chimera;
 
@@ -370,7 +370,11 @@ public class ChimeraManager
   {
     chimera = null;
     currentModelsMap.clear();
-    if (!USE_REST)
+    if (USE_REST)
+    {
+      this.chimeraRestPort = 0;
+    }
+    else
     {
       chimeraListenerThread.requestStop();
       chimeraListenerThread = null;
@@ -564,7 +568,8 @@ public class ChimeraManager
     {
       if (USE_REST)
       {
-        this.restPort = getPortNumber();
+        this.chimeraRestPort = getPortNumber();
+        System.out.println("Chimera REST API on port " + chimeraRestPort);
       }
       else
       {
@@ -603,7 +608,8 @@ public class ChimeraManager
       String [] tokens = response.split(" ");
       if (tokens.length == 7 && "port".equals(tokens[5])) {
         port = Integer.parseInt(tokens[6]);
-        logger.info("Chimera REST service listening on port " + restPort);
+        logger.info("Chimera REST service listening on port "
+                + chimeraRestPort);
       }
     } catch (Exception e)
     {
@@ -796,7 +802,7 @@ public class ChimeraManager
   protected List<String> sendRestCommand(String command)
   {
     // TODO start a separate thread to do this so we don't block?
-    String restUrl = "http://127.0.0.1:" + this.restPort + "/run";
+    String restUrl = "http://127.0.0.1:" + this.chimeraRestPort + "/run";
     List<NameValuePair> commands = new ArrayList<NameValuePair>(1);
     commands.add(new BasicNameValuePair("command", command));