Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / ext / rbvi / chimera / ChimeraListener.java

diff --git a/src/jalview/ext/rbvi/chimera/ChimeraListener.java b/src/jalview/ext/rbvi/chimera/ChimeraListener.java
index a0d74bc..0c2a478 100644 (file)
--- a/src/jalview/ext/rbvi/chimera/ChimeraListener.java
+++ b/src/jalview/ext/rbvi/chimera/ChimeraListener.java
@@ -114,17 +114,26 @@ public class ChimeraListener extends AbstractRequestHandler
   {
     // dumpRequest(request);
     String message = request.getParameter(CHIMERA_NOTIFICATION);
-    if (SELECTION_CHANGED.equals(message))
+    if (message == null)
     {
-      this.chimeraBinding.highlightChimeraSelection();
+      message = request.getParameter("chimerax_notification");
     }
-    else if (message != null && message.startsWith(MODEL_CHANGED))
+    if (message != null)
     {
-      processModelChanged(message.substring(MODEL_CHANGED.length()));
-    }
-    else
-    {
-      System.err.println("Unexpected chimeraNotification: " + message);
+      if (message.startsWith("SelectionChanged"))
+      {
+        this.chimeraBinding.highlightChimeraSelection();
+      }
+      else if (message.startsWith(MODEL_CHANGED))
+      {
+        jalview.bin.Console.errPrintln(message);
+        processModelChanged(message.substring(MODEL_CHANGED.length()));
+      }
+      else
+      {
+        jalview.bin.Console
+                .errPrintln("Unexpected chimeraNotification: " + message);
+      }
     }
   }
 
@@ -135,7 +144,8 @@ public class ChimeraListener extends AbstractRequestHandler
    */
   protected void processModelChanged(String message)
   {
-    // System.out.println(message + " (not implemented in Jalview)");
+    // jalview.bin.Console.outPrintln(message + " (not implemented in
+    // Jalview)");
   }
 
   /**