diff options
author | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-06-13 23:31:47 +0200 |
---|---|---|
committer | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-06-13 23:31:47 +0200 |
commit | f5a05f2c8d42b9f5978d8118c065fa8a871ec2fd (patch) | |
tree | 041fb50e7384618ed2202628f12df602e8c40394 /src/jrummikub/control/network | |
parent | 570187c95000afd1ac9f6d6e8bb5cab30b984e87 (diff) | |
download | JRummikub-f5a05f2c8d42b9f5978d8118c065fa8a871ec2fd.tar JRummikub-f5a05f2c8d42b9f5978d8118c065fa8a871ec2fd.zip |
Kommentare und kleinere Umbauten
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@426 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/network')
-rw-r--r-- | src/jrummikub/control/network/ConnectionControl.java | 2 | ||||
-rw-r--r-- | src/jrummikub/control/network/NetworkControl.java | 7 | ||||
-rw-r--r-- | src/jrummikub/control/network/NetworkSettingsControl.java | 13 |
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(); |