From 52c1e7a6643d4a010c5571f565386440e17fe5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Thu, 26 Jan 2012 19:44:55 +0100
Subject: Use SameController in ClientApp.

---
 same/src/main/java/com/orbekk/same/ClientApp.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'same')

diff --git a/same/src/main/java/com/orbekk/same/ClientApp.java b/same/src/main/java/com/orbekk/same/ClientApp.java
index b8b6730..3c67ae2 100644
--- a/same/src/main/java/com/orbekk/same/ClientApp.java
+++ b/same/src/main/java/com/orbekk/same/ClientApp.java
@@ -53,12 +53,14 @@ public class ClientApp {
     
     public void run(int port, String networkName,
             String masterUrl) {
-        getClient(port, networkName, masterUrl);
+        SameController controller = SameController.create(port);
         try {
-            server.join();
-        } catch (InterruptedException e) {
-            logger.warn("Interrupted.", e);
+            controller.start();
+        } catch (Exception e) {
+            logger.error("Failed to start Same", e);
         }
+        controller.joinNetwork(masterUrl);
+        controller.join();
     }
     
     public static void main(String[] args) {
-- 
cgit v1.2.3