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

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

diff --git a/src/uk/ac/vamsas/client/picking/PickEndPoint.java b/src/uk/ac/vamsas/client/picking/PickEndPoint.java
index c9e8507..8191a80 100644 (file)
--- a/src/uk/ac/vamsas/client/picking/PickEndPoint.java
+++ b/src/uk/ac/vamsas/client/picking/PickEndPoint.java
@@ -4,9 +4,11 @@ import java.io.*;
 import java.net.*;\r
 import java.util.logging.*;\r
 \r
+import org.apache.commons.logging.Log;\r
+\r
 class PickEndPoint extends Thread\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.PickEndPoint.class);\r
        \r
        private Socket socket;\r
        private int rPort;\r
@@ -37,15 +39,15 @@ class PickEndPoint extends Thread
                        in = new BufferedReader(new InputStreamReader(socket.getInputStream()));\r
                \r
                        // Start the thread to listen for incoming messages\r
-//                     logger.info("CLIENT: connection successful to port "\r
-//                             + socket.getPort() + " via port " + socket.getLocalPort());\r
+                       logger.info("CLIENT: connection successful to port "\r
+                               + socket.getPort() + " via port " + socket.getLocalPort());\r
                        start();\r
                        \r
                        return true;\r
                }\r
                catch (Exception e)\r
                {\r
-                       //logger.info("CLIENT: connection failed: " + e);\r
+                       logger.info("CLIENT: connection failed: " + e);\r
                        return false;\r
                }\r
        }\r
@@ -102,7 +104,7 @@ class PickEndPoint extends Thread
                }\r
        }\r
        \r
-       private void terminate()\r
+       void terminate()\r
        {\r
                try { socket.close(); }\r
                catch (IOException e) {}\r