neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make NetworkRoundControl test work

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@496 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-19 23:19:01 +02:00
parent 890051a3e9
commit 9df5497276
6 changed files with 109 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/jrummikub/control/turn/AbstractTurnControl.java
View file

@ -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();
}

1
src/jrummikub/control/turn/HumanTurnControl.java
View file

@ -90,7 +90,6 @@ public class HumanTurnControl extends AbstractTurnControl {
connections.add(view.getPlayerPanel().getEndTurnEvent()
.add(new IListener() {
@Override
public void handle() {
endOfTurn(false);