From f3f8ffe4621e91d33732bba9e103ff790a16c7b3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 20 Jun 2011 03:59:04 +0200 Subject: Added NetworkGameControl git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@503 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/network/GameJoinControl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/jrummikub/control/network/GameJoinControl.java') diff --git a/src/jrummikub/control/network/GameJoinControl.java b/src/jrummikub/control/network/GameJoinControl.java index b9690b6..5d31e74 100644 --- a/src/jrummikub/control/network/GameJoinControl.java +++ b/src/jrummikub/control/network/GameJoinControl.java @@ -5,7 +5,9 @@ import java.util.UUID; import jrummikub.model.GameSettings; import jrummikub.model.PlayerSettings; import jrummikub.model.PlayerSettings.Type; +import jrummikub.util.Event; import jrummikub.util.GameData; +import jrummikub.util.IEvent; import jrummikub.util.IListener; import jrummikub.util.IListener1; import jrummikub.view.ISettingsPanel.SettingsMode; @@ -15,6 +17,7 @@ import jrummikub.view.IView; * Control for joining a network game */ public class GameJoinControl extends AbstractGameBeginControl { + private Event gameStartEvent = new Event(); /** * Creates new game join control @@ -63,11 +66,21 @@ public class GameJoinControl extends AbstractGameBeginControl { connections.add(connectionControl.getGameStartEvent().add(new IListener() { @Override public void handle() { - startGame(); + abort(); + gameStartEvent.emit(); } })); } + /** + * The event that is emitted when the game is started + * + * @return the event + */ + public IEvent getStartGameEvent() { + return gameStartEvent; + } + private void fixGameSettings(GameSettings settings) { for (PlayerSettings player : settings.getPlayerList()) { if (player.getType() == Type.HUMAN) { -- cgit v1.2.3