diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
| commit | 04d448aade12127b1d8c9d4f26963833102698f8 (patch) | |
| tree | b4120784e328197aa5d724f6e6ca0d4d3b676c7d /same/src/main/java/com/orbekk/same/SameController.java | |
| parent | a21280cc77c163ec7bd7bc1fc4b451a1fc01a1d8 (diff) | |
Change Client.joinNetwork.
Take MasterState instead of a simple URL.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
| -rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index a68290d..900dcbc 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -138,11 +138,11 @@ public class SameController { masterController.enableMaster(new State(networkName), 1); String masterUrl = configuration.get("baseUrl") + "MasterService.json"; - joinNetwork(masterUrl); + joinNetwork(master.getMasterInfo()); } - public void joinNetwork(String url) { - client.joinNetwork(url); + public void joinNetwork(Services.MasterState masterInfo) { + client.joinNetwork(masterInfo); } public Client getClient() { |