Tests für NetworkControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@473 72836036-5685-4462-b002-a69064685172

3 files changed, 11 insertions, 11 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
diff --git a/src/jrummikub/control/network/ConnectionControl.java b/src/jrummikub/control/network/ConnectionControl.java
index e435309..81f6095 100644
--- a/src/jrummikub/control/network/ConnectionControl.java
+++ b/src/jrummikub/control/network/ConnectionControl.java
@@ -32,7 +32,7 @@ import org.jivesoftware.smack.util.Base64;
 import org.jivesoftware.smackx.muc.DiscussionHistory;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 
-class ConnectionControl implements IConnectionControl {
+public class ConnectionControl implements IConnectionControl {
 	private final static String ELEMENT_NAME = "rummikub";
 	private final static String NAMESPACE = "http://home.universe-factory.net/rummikub/";
 
@@ -57,7 +57,7 @@ class ConnectionControl implements IConnectionControl {
 
 	private volatile GameData offeredGame;
 
-	ConnectionControl(LoginData loginData) {
+	public ConnectionControl(LoginData loginData) {
 		this.loginData = loginData;
 	}
 
diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index a8faac5..cfb3c14 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -40,12 +40,13 @@ public class NetworkControl {
 	 * @param view
 	 *            for events and handlers
 	 */
-	public NetworkControl(final LoginData loginData, final IView view) {
+	public NetworkControl(final LoginData loginData,
+			IConnectionControl connectionControl, final IView view) {
 		this.view = view;
-		connectionControl = new ConnectionControl(loginData);
+		this.connectionControl = connectionControl;
 
 		addConnectionSetupListeners(loginData, view);
-		addConnectionControlListeners(loginData, view);
+		addConnectionControlListeners(view);
 
 		connections.add(view.getGameListPanel().getJoinEvent().add(
 				new IListener1<GameData>() {
@@ -81,13 +82,10 @@ public class NetworkControl {
 	/**
 	 * Adds the listeners for connection control events
 	 * 
-	 * @param loginData
-	 *            player's login data
 	 * @param view
 	 *            view for events
 	 */
-	public void addConnectionControlListeners(final LoginData loginData,
-			final IView view) {
+	public void addConnectionControlListeners(final IView view) {
 		connections.add(connectionControl.getGameOfferEvent().add(
 				new IListener1<GameData>() {
 					@Override