From 52088a08a9edb6d4b60e1e8923e1b3199db9f391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Wed, 11 Jan 2012 10:47:27 +0100 Subject: Continue SameService implementation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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. --- jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'jsonrpc/src/main/java/com/orbekk/same/SameServiceImpl.java') 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 -- cgit v1.2.3