From e0be019abeb169a4e2e5725143b27e041e140cf8 Mon Sep 17 00:00:00 2001
From: TJ <hacker@iam.tj>
Date: Sun, 3 May 2015 11:47:55 +0100
Subject: [PATCH] NetworkServerAbstract: make LastSeenHost immutable and create
 method getTargeAddress() to query services map

---
 .../wsyd/libs/net/NetworkServerAbstract.java  | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerAbstract.java b/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerAbstract.java
index d6f9f2b..691afc6 100644
--- a/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerAbstract.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerAbstract.java
@@ -109,9 +109,12 @@ public abstract class NetworkServerAbstract extends SwingWorker<Integer, Network
      */
     protected ConcurrentLinkedQueue<NetworkMessage> _sendMessageQueue = new ConcurrentLinkedQueue<>();
 
+    /**
+     * Encapsulates a unique network host and the last time it was seen.
+     */
     protected class LastSeenHost {
-        long timeInMillis;
-        InetSocketAddress address;
+        final long timeInMillis;
+        final InetSocketAddress address;
         
         LastSeenHost(InetSocketAddress address, long timeInMillis) {
             this.address = address;
@@ -121,6 +124,14 @@ public abstract class NetworkServerAbstract extends SwingWorker<Integer, Network
             this(host, System.currentTimeMillis());
         }
         
+        /**
+         * Formatted string representation of IneAddress and timestamp.
+         * @return the representation
+         */
+        @Override
+        public String toString() {
+            return MessageFormat.format("{0}:{1,number,integer}@{2}", this.address.getHostString(), this.address.getPort(), this.timeInMillis);
+        }
     };
     /**
      * Maps service _title to its parent network host.
@@ -173,7 +184,7 @@ public abstract class NetworkServerAbstract extends SwingWorker<Integer, Network
     protected static void log(Level level, String title, String message) {
         if (LOGGER == null)
             return;
-        LOGGER.logp(level, title, null, MessageFormat.format("{1}", message));
+        LOGGER.logp(level, title, null, message);
     }
 
     /**
@@ -433,6 +444,24 @@ public abstract class NetworkServerAbstract extends SwingWorker<Integer, Network
         return result;
     }
 
+    /**
+     * Get the current InetAddress of a target from the services map.
+     * 
+     * @param target name of the service
+     * @return IP address and port of the service
+     */
+    public InetSocketAddress getTargetAddress(String target) {
+        InetSocketAddress result = null;
+        
+        if (target != null && target.length() > 0) {
+            LastSeenHost host = this._serviceToHostMap.get(target);
+            if (host != null)
+                result = host.address;
+        }
+        
+        return result;
+    }
+
     /**
      * Add a NetworkMessageEvent listener.
      * 
-- 
2.17.1