X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraListener.java;h=40b0ff0b2c86bcb4682e8c7008c8e695dc2c88f3;hb=584ab9644955bec02d96448361b8aac5b9542599;hp=3c2e917b6f3367cfb702e5316bb6c0120e82ff78;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git
diff --git a/src/jalview/ext/rbvi/chimera/ChimeraListener.java b/src/jalview/ext/rbvi/chimera/ChimeraListener.java
index 3c2e917..40b0ff0 100644
--- a/src/jalview/ext/rbvi/chimera/ChimeraListener.java
+++ b/src/jalview/ext/rbvi/chimera/ChimeraListener.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.
*
@@ -39,7 +39,8 @@ import javax.servlet.http.HttpServletResponse;
*
Start the ChimeraListener, get the URL it is listening on
* The first listener started will start the singleton HttpServer
* Send a 'listen' command to Chimera with the URL of the listener
- * When Jalview's Chimera window is closed, shut down the ChimeraListener
+ * When Jalview's Chimera window is closed, shut down the
+ * ChimeraListener
* Multiple linked Chimera instances will each have a separate listener (but
* share one Http server)
*
@@ -47,8 +48,8 @@ import javax.servlet.http.HttpServletResponse;
* @author gmcarstairs
*
*/
-public class ChimeraListener extends AbstractRequestHandler implements
- SelectionSource
+public class ChimeraListener extends AbstractRequestHandler
+ implements SelectionSource
{
/*
* Chimera notification parameter name
@@ -96,8 +97,7 @@ public class ChimeraListener extends AbstractRequestHandler implements
* @throws BindException
* if no free port can be assigned
*/
- public ChimeraListener(JalviewChimeraBinding binding)
- throws BindException
+ public ChimeraListener(JalviewChimeraBinding binding) throws BindException
{
myChimeraId = chimeraId++;
this.chimeraBinding = binding;
@@ -114,22 +114,30 @@ public class ChimeraListener extends AbstractRequestHandler implements
{
// 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))
+ {
+ System.err.println(message);
+ processModelChanged(message.substring(MODEL_CHANGED.length()));
+ }
+ else
+ {
+ System.err.println("Unexpected chimeraNotification: " + message);
+ }
}
}
/**
- * Handler a ModelChanged notification from Chimera
+ * Handle a ModelChanged notification from Chimera
*
* @param substring
*/