diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-19 23:19:01 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-19 23:19:01 +0200 |
| commit | 9df549727672e8df768d46e3ef1fb0c7957f0f89 (patch) | |
| tree | 3ad4ef018dfb850aee56771c4227d9ce0b32be7e /src/jrummikub/control/turn | |
| parent | 890051a3e93a31d0e1a6bc1a1d1bc14a7205b8b9 (diff) | |
| download | JRummikub-9df549727672e8df768d46e3ef1fb0c7957f0f89.tar JRummikub-9df549727672e8df768d46e3ef1fb0c7957f0f89.zip | |
Make NetworkRoundControl test work
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@496 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/turn')
| -rw-r--r-- | src/jrummikub/control/turn/AbstractTurnControl.java | 6 | ||||
| -rw-r--r-- | src/jrummikub/control/turn/HumanTurnControl.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/jrummikub/control/turn/AbstractTurnControl.java b/src/jrummikub/control/turn/AbstractTurnControl.java index f129f24..b687ca0 100644 --- a/src/jrummikub/control/turn/AbstractTurnControl.java +++ b/src/jrummikub/control/turn/AbstractTurnControl.java @@ -97,7 +97,11 @@ public abstract class AbstractTurnControl implements ITurnControl { } protected void cleanUp() { - timer.stopTimer(); + if (timer != null) { + timer.stopTimer(); + } + started = true; + for (Connection c : connections) { c.remove(); } diff --git a/src/jrummikub/control/turn/HumanTurnControl.java b/src/jrummikub/control/turn/HumanTurnControl.java index 51f77e4..7ca2731 100644 --- a/src/jrummikub/control/turn/HumanTurnControl.java +++ b/src/jrummikub/control/turn/HumanTurnControl.java @@ -90,7 +90,6 @@ public class HumanTurnControl extends AbstractTurnControl { connections.add(view.getPlayerPanel().getEndTurnEvent() .add(new IListener() { - @Override public void handle() { endOfTurn(false); |