Added shutdown() methods for the socket-based PickManager code.

[vamsas.git] / src / uk / ac / vamsas / client / simpleclient / SimplePickManager.java

diff --git a/src/uk/ac/vamsas/client/simpleclient/SimplePickManager.java b/src/uk/ac/vamsas/client/simpleclient/SimplePickManager.java
index 7b33f48..376662c 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/SimplePickManager.java
+++ b/src/uk/ac/vamsas/client/simpleclient/SimplePickManager.java
@@ -41,7 +41,7 @@ public class SimplePickManager implements IPickManager {
     \r
   }\r
 \r
-  public void sendMessage(Message message) {\r
+  public synchronized void sendMessage(Message message) {\r
     manager.sendMessage(message);\r
   }\r
   /**\r
@@ -49,7 +49,7 @@ public class SimplePickManager implements IPickManager {
    * passThru is true before passing message on.\r
    * @param message\r
    */\r
-  protected void handleMessage(Message message) {\r
+  protected synchronized void handleMessage(Message message) {\r
     while (!passThru) {\r
       try {\r
         Thread.sleep(5);\r
@@ -72,9 +72,8 @@ public class SimplePickManager implements IPickManager {
   public void setPassThru(boolean passThru) {\r
     this.passThru = passThru;\r
   }\r
-  public void haltPickManager() {\r
-      // TODO: FIX haltPickManager to cleanly end after SimpleClient.finalize() is called\r
-      manager.haltManager();\r
-      \r
+  \r
+  public void shutdown() {\r
+       manager.shutdown();\r
   }\r
 }\r