Continue SameService implementation.

- Implement ConnectionManager.
- SameService now calls notifyParticipation() when a client tries to
  join.
- Add client ids – this may or may not be a good idea.
- Refactor App and Client code.

1 files changed, 6 insertions, 3 deletions

diff --git a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
index 0052de3..e7484c1 100644
--- a/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
+++ b/jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java
@@ -26,13 +26,16 @@ public class SameServiceImpl implements SameService, CallerInfoListener {
     }
 
     @Override
-    public void participateNetwork(String networkName, int remotePort) {
+    public void participateNetwork(String networkName, String clientId,
+            String url, int remotePort) {
         if (!networkName.equals(sameState.getNetworkName())) {
             logger.warn("Client tried to join {}, but network name is {}.",
                     networkName, sameState.getNetworkName());
         }
-        String url = "http://" + currentCallerIp + ":" + remotePort;
-        sameState.addParticipant(url);
+        if (url.equals("")) {
+            url = "http://" + currentCallerIp + ":" + remotePort;
+        }
+        sameState.addParticipant(clientId, url);
     }
 
     @Override