git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1575 bare bones RestHandler added
[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
c9ec136
..
2882cb5
100644
(file)
--- 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 javax.servlet.http.HttpServletResponse;
import jalview.httpserver.AbstractRequestHandler;
-import jalview.httpserver.HttpServer;
import jalview.structure.SelectionSource;
/**
import jalview.structure.SelectionSource;
/**
@@
-31,10
+30,19
@@
import jalview.structure.SelectionSource;
public class ChimeraListener extends AbstractRequestHandler implements
SelectionSource
{
public class ChimeraListener extends AbstractRequestHandler implements
SelectionSource
{
+ /*
+ * Chimera notification parameter name
+ */
private static final String CHIMERA_NOTIFICATION = "chimeraNotification";
private static final String CHIMERA_NOTIFICATION = "chimeraNotification";
+ /*
+ * Chimera model changed notifications start with this
+ */
private static final String MODEL_CHANGED = "ModelChanged: ";
private static final String MODEL_CHANGED = "ModelChanged: ";
+ /*
+ * Chimera selection changed notification message
+ */
private static final String SELECTION_CHANGED = "SelectionChanged: selection changed\n";
/*
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;
/*
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
/*
* Value of chimeraId (0, 1, 2...) for this instance
@@
-59,13
+67,8
@@
public class ChimeraListener extends AbstractRequestHandler implements
*/
private JalviewChimeraBinding chimeraBinding;
*/
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.
*
* /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;
{
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";
}
}
}
}