added (broken) haltPickManager methods

[vamsas.git] / src / uk / ac / vamsas / client / picking / SocketManager.java

diff --git a/src/uk/ac/vamsas/client/picking/SocketManager.java b/src/uk/ac/vamsas/client/picking/SocketManager.java
index edfd573..5df3c43 100644 (file)
--- a/src/uk/ac/vamsas/client/picking/SocketManager.java
+++ b/src/uk/ac/vamsas/client/picking/SocketManager.java
@@ -4,6 +4,8 @@ import java.net.*;
 import java.util.*;\r
 import java.util.logging.*;\r
 \r
+import org.apache.commons.logging.Log;\r
+\r
 /**\r
  * Concrete implementation of the IPickManager interface that uses sockets for\r
  * message communication. An instance of this class attempts to run the central\r
@@ -12,7 +14,7 @@ import java.util.logging.*;
  */\r
 public class SocketManager implements IPickManager\r
 {\r
-       private Logger logger = Logger.getLogger("uk.ac.vamsas.client.picking");\r
+       private Log logger = org.apache.commons.logging.LogFactory.getLog(uk.ac.vamsas.client.picking.SocketManager.class);\r
        \r
        // Maintains a list of client communication objects - each object represents\r
        // a way of talking to either:\r
@@ -161,4 +163,17 @@ public class SocketManager implements IPickManager
                        }\r
                }\r
        }\r
+  public void haltManager() {\r
+    // TODO: FIX this method\r
+    if (server==null)\r
+      throw new Error("Client Implementation Error: haltManager called on uninitialized SocketManager.");\r
+    logger.debug("Halting PickManager threads...");\r
+    while (clients.size()>0) {\r
+      ((PickEndPoint)clients.getFirst()).haltEndpoint();\r
+    }\r
+    server.haltServer();\r
+    \r
+    logger.debug("Halted PickManager threads.");\r
+    \r
+  }\r
 }
\ No newline at end of file