3 files changed, 11 insertions, 11 deletions
diff --git a/src/jrummikub/control/network/ConnectionControl.java b/src/jrummikub/control/network/ConnectionControl.java
index fd8087a..7980c2d 100644
--- a/src/jrummikub/control/network/ConnectionControl.java
+++ b/src/jrummikub/control/network/ConnectionControl.java
@@ -7,10 +7,10 @@ import javax.swing.SwingUtilities;
 import jrummikub.model.GameSettings;
 import jrummikub.util.Event;
 import jrummikub.util.Event1;
+import jrummikub.util.GameData;
 import jrummikub.util.IEvent;
 import jrummikub.util.IEvent1;
 import jrummikub.util.LoginData;
-import jrummikub.view.IGameListPanel.GameData;
 
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.PacketListener;
diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index 929ce03..4f4dad6 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -9,12 +9,11 @@ import java.util.UUID;
 import jrummikub.model.GameSettings;
 import jrummikub.util.Connection;
 import jrummikub.util.Event;
+import jrummikub.util.GameData;
 import jrummikub.util.IEvent;
 import jrummikub.util.IListener;
 import jrummikub.util.IListener1;
 import jrummikub.util.LoginData;
-import jrummikub.view.IGameListPanel;
-import jrummikub.view.IGameListPanel.GameData;
 import jrummikub.view.IView;
 
 /**
@@ -45,7 +44,7 @@ public class NetworkControl {
 		addConnectionControlListeners(loginData, view);
 
 		connections.add(view.getGameListPanel().getJoinEvent()
-				.add(new IListener1<IGameListPanel.GameData>() {
+				.add(new IListener1<GameData>() {
 					@Override
 					public void handle(GameData value) {
 						// TODO Auto-generated method stub
@@ -107,7 +106,7 @@ public class NetworkControl {
 				}));
 
 		connections.add(connectionControl.getGameOfferEvent().add(
-				new IListener1<IGameListPanel.GameData>() {
+				new IListener1<GameData>() {
 					@Override
 					public void handle(GameData value) {
 						GameData game = gameMap.get(value.getGameID());
diff --git a/src/jrummikub/control/network/NetworkSettingsControl.java b/src/jrummikub/control/network/NetworkSettingsControl.java
index 61fcfa3..3c8dc42 100644
--- a/src/jrummikub/control/network/NetworkSettingsControl.java
+++ b/src/jrummikub/control/network/NetworkSettingsControl.java
@@ -21,12 +21,12 @@ public class NetworkSettingsControl extends SettingsControl {
 	/**
 	 * Creates a new network settings control
 	 * 
-	 * @param connectionControl
-	 *          for gameOffers
+	 * @param nickname
+	 *            to be set as player name
 	 * @param view
-	 *          for events and handlers
+	 *            for events and handlers
 	 * @param settings
-	 *          for playerNumber, color...
+	 *            for playerNumber, color...
 	 */
 	public NetworkSettingsControl(String nickname, IView view,
 			GameSettings settings) {
@@ -45,8 +45,9 @@ public class NetworkSettingsControl extends SettingsControl {
 
 	@Override
 	protected void update() {
-		view.getSettingsPanel().enableAddPlayerButton(
-				settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
+		view.getSettingsPanel()
+				.enableAddPlayerButton(
+						settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
 
 		checkSettings();