NetworkPresence: encapsulate WSYD_SocketAddress

Storing a simple port number is not sufficient. The WSYD_SocketAddress
can be passed directly between hosts and into constructors, and for services
and sockets.

diff --git a/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessagePresence.java b/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessagePresence.java
index 948eb34..2c6143e 100644 (file)
--- a/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessagePresence.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessagePresence.java
@@ -23,6 +23,8 @@
  */
 package uk.ac.ntu.n0521366.wsyd.libs.message;
 
+import uk.ac.ntu.n0521366.wsyd.libs.net.WSYD_SocketAddress;
+
 /**
  *
  * @author TJ <hacker@iam.tj>
@@ -54,7 +56,7 @@ public class MessagePresence extends MessageAbstract {
      * 
      * The IP address should be set by the receiving service in the sourceAddress property.
      */
-    int port;
+    public WSYD_SocketAddress socketAddress;
 
     /**
      * The message type
@@ -65,9 +67,9 @@ public class MessagePresence extends MessageAbstract {
         return _type;
     }
 
-    public MessagePresence(String service, int port) {
+    public MessagePresence(String service, WSYD_SocketAddress socketAddress) {
         super();
         this.serviceName = service;
-        this.port = port;
+        this.socketAddress = socketAddress;
     } 
 }