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

Changed TurnControl to use Connections to remove listeners

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@153 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-05 19:56:47 +02:00
parent 5917f88a02
commit 8c65bafde4
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/jrummikub/control/TurnControl.java
View file

@ -1,7 +1,11 @@
package jrummikub.control; package jrummikub.control;
import java.util.ArrayList;
import java.util.List;
import jrummikub.model.IHand; import jrummikub.model.IHand;
import jrummikub.model.ITable; import jrummikub.model.ITable;
import jrummikub.util.Connection;
import jrummikub.util.Event; import jrummikub.util.Event;
import jrummikub.util.IEvent; import jrummikub.util.IEvent;
import jrummikub.util.IListener; import jrummikub.util.IListener;
@ -13,7 +17,7 @@ public class TurnControl {
private ITurnTimer timer; private ITurnTimer timer;
private IView view; private IView view;
private Event endOfTurnEvent = new Event(); private Event endOfTurnEvent = new Event();
IListener endOfTurnListener; List<Connection> connections = new ArrayList<Connection>();
public TurnControl(IHand hand, ITable table, IView view) { public TurnControl(IHand hand, ITable table, IView view) {
this.hand = hand; this.hand = hand;
@ -32,15 +36,15 @@ public class TurnControl {
public void startTurn() { public void startTurn() {
endOfTurnListener = new IListener() { IListener endOfTurnListener = new IListener() {
@Override @Override
public void handle() { public void handle() {
endOfTurn(); endOfTurn();
} }
}; };
timer.getTimeRunOutEvent().add(endOfTurnListener); connections.add(timer.getTimeRunOutEvent().add(endOfTurnListener));
view.getPlayerPanel().getEndTurnEvent().add(endOfTurnListener); connections.add(view.getPlayerPanel().getEndTurnEvent().add(endOfTurnListener));
view.getPlayerPanel().getHandPanel().setStones(hand.clone()); view.getPlayerPanel().getHandPanel().setStones(hand.clone());
view.enableStartTurnPanel(false); view.enableStartTurnPanel(false);
@ -59,7 +63,9 @@ public class TurnControl {
private void endOfTurn() { private void endOfTurn() {
timer.stopTimer(); timer.stopTimer();
endOfTurnEvent.emit(); endOfTurnEvent.emit();
view.getPlayerPanel().getEndTurnEvent().remove(endOfTurnListener); for (Connection c : connections) {
c.remove();
}
} }
public IEvent getEndOfTurnEvent() { public IEvent getEndOfTurnEvent() {