summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/ApplicationControl.java
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-19 00:28:23 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-19 00:28:23 +0200
commitd47e291d19dfc2c3a351c0ba94469e3d50637411 (patch)
treeb54027e861277fdc8205a6b7dc4c44f63dfb3242 /src/jrummikub/control/ApplicationControl.java
parent80f0c0d43faab53ec30333529d748bdd725a72df (diff)
downloadJRummikub-d47e291d19dfc2c3a351c0ba94469e3d50637411.tar
JRummikub-d47e291d19dfc2c3a351c0ba94469e3d50637411.zip
Tests für NetworkControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@473 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/ApplicationControl.java')
-rw-r--r--src/jrummikub/control/ApplicationControl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java
index 3e429d2..bcf497f 100644
--- a/src/jrummikub/control/ApplicationControl.java
+++ b/src/jrummikub/control/ApplicationControl.java
@@ -1,5 +1,6 @@
package jrummikub.control;
+import jrummikub.control.network.ConnectionControl;
import jrummikub.control.network.NetworkControl;
import jrummikub.model.GameSettings;
import jrummikub.model.GameState;
@@ -71,7 +72,7 @@ public class ApplicationControl {
@Override
public void handle() {
abortControls();
-
+
loginControl = new LoginControl(view);
loginControl.getLoginEvent().add(new IListener1<LoginData>() {
@Override
@@ -149,7 +150,8 @@ public class ApplicationControl {
}
private void createNetworkControl(LoginData loginData) {
- networkControl = new NetworkControl(loginData, view);
+ ConnectionControl connectionControl = new ConnectionControl(loginData);
+ networkControl = new NetworkControl(loginData, connectionControl, view);
networkControl.getStopNetworkEvent().add(new IListener() {
@Override