X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraListener.java;h=2882cb5ec3318794eda08041a81e805b00362270;hb=2150df780eddbdf72013d29ee8eabb0f235c7bb4;hp=c9ec1365ccf0aa77e7a345d1b08bf5170b4dea56;hpb=e5b2fbdb4ecc9faaadcc3e18fabad8794fca44aa;p=jalview.git

diff --git a/src/jalview/ext/rbvi/chimera/ChimeraListener.java b/src/jalview/ext/rbvi/chimera/ChimeraListener.java
index c9ec136..2882cb5 100644
--- a/src/jalview/ext/rbvi/chimera/ChimeraListener.java
+++ b/src/jalview/ext/rbvi/chimera/ChimeraListener.java
@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import jalview.httpserver.AbstractRequestHandler;
-import jalview.httpserver.HttpServer;
 import jalview.structure.SelectionSource;
 
 /**
@@ -31,10 +30,19 @@ import jalview.structure.SelectionSource;
 public class ChimeraListener extends AbstractRequestHandler implements
         SelectionSource
 {
+  /*
+   * Chimera notification parameter name
+   */
   private static final String CHIMERA_NOTIFICATION = "chimeraNotification";
 
+  /*
+   * Chimera model changed notifications start with this
+   */
   private static final String MODEL_CHANGED = "ModelChanged: ";
 
+  /*
+   * Chimera selection changed notification message
+   */
   private static final String SELECTION_CHANGED = "SelectionChanged: selection changed\n";
 
   /*
@@ -45,9 +53,9 @@ public class ChimeraListener extends AbstractRequestHandler implements
   private static int chimeraId = 0;
 
   /*
-   * Path below context root that identifies this handler
+   * Prefix for path below context root (myChimeraId is appended)
    */
-  private static final String LISTENER_PATH = "chimera";
+  private static final String PATH_PREFIX = "chimera";
 
   /*
    * Value of chimeraId (0, 1, 2...) for this instance
@@ -59,13 +67,8 @@ public class ChimeraListener extends AbstractRequestHandler implements
    */
   private JalviewChimeraBinding chimeraBinding;
 
-  /*
-   * The URI of this listener
-   */
-  private String uri;
-
   /**
-   * Constructor that also registers this as an Http request handler on path
+   * Constructor that registers this as an Http request handler on path
    * /chimeraN, where N is incremented for each instance. Call getUri to get the
    * resulting URI for this handler.
    * 
@@ -78,18 +81,8 @@ public class ChimeraListener extends AbstractRequestHandler implements
   {
     myChimeraId = chimeraId++;
     this.chimeraBinding = binding;
-    final String path = LISTENER_PATH + myChimeraId;
-    this.uri = HttpServer.getInstance().registerHandler(path, this);
-  }
-
-  /**
-   * Returns the URI on which we are listening
-   * 
-   * @return
-   */
-  public String getUri()
-  {
-    return this.uri;
+    setPath(PATH_PREFIX + myChimeraId);
+    registerHandler();
   }
 
   /**
@@ -126,20 +119,11 @@ public class ChimeraListener extends AbstractRequestHandler implements
   }
 
   /**
-   * Deregister this listener and close it down
-   * 
-   * @throws Exception
+   * Returns a display name for this service
    */
-  public void shutdown()
+  @Override
+  public String getName()
   {
-    try
-    {
-      HttpServer.getInstance().removeHandler(this);
-      stop();
-    } catch (Exception e)
-    {
-      System.err.println("Error stopping chimera listener: "
-              + e.getMessage());
-    }
+    return "ChimeraListener";
   }
 }