Moved timer code to AbstractTurnControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@383 72836036-5685-4462-b002-a69064685172

1 files changed, 5 insertions, 21 deletions

diff --git a/src/jrummikub/control/turn/HumanTurnControl.java b/src/jrummikub/control/turn/HumanTurnControl.java
index 3bedc1a..02541d2 100644
--- a/src/jrummikub/control/turn/HumanTurnControl.java
+++ b/src/jrummikub/control/turn/HumanTurnControl.java
@@ -7,13 +7,11 @@ import java.util.LinkedList;
 import java.util.List;
 
 import jrummikub.control.ITurnTimer;
-import jrummikub.control.TurnTimer;
 import jrummikub.model.Hand;
 import jrummikub.model.Position;
 import jrummikub.model.Stone;
 import jrummikub.model.StoneColor;
 import jrummikub.model.StoneSet;
-import jrummikub.util.Connection;
 import jrummikub.util.IListener;
 import jrummikub.util.IListener1;
 import jrummikub.util.IListener2;
@@ -24,12 +22,8 @@ import jrummikub.view.IView.BottomPanelType;
  * Controller for a single turn made by a human player
  */
 public class HumanTurnControl extends AbstractTurnControl {
-	private ITurnTimer timer;
-
 	private List<Stone> selectedStones = new ArrayList<Stone>();
 
-	private List<Connection> connections = new ArrayList<Connection>();
-
 	/**
 	 * Create a new human player's turn control
 	 */
@@ -54,20 +48,13 @@ public class HumanTurnControl extends AbstractTurnControl {
 	HumanTurnControl(ITurnTimer testTimer) {
 		this.timer = testTimer;
 	}
+	
+	protected void timeOut() {
+		endOfTurn(false);
+	}
 
 	@Override
 	public void startTurn() {
-		if (this.timer == null) {
-			this.timer = new TurnTimer(view);
-		}
-
-		connections.add(timer.getTimeRunOutEvent().add(new IListener() {
-
-			@Override
-			public void handle() {
-				endOfTurn(false);
-			}
-		}));
 		addButtonHandlers();
 
 		addHandPanelHandlers();
@@ -453,15 +440,12 @@ public class HumanTurnControl extends AbstractTurnControl {
 	}
 
 	private void endOfTurn(boolean redeal) {
-		timer.stopTimer();
+		cleanUp();
 		if (redeal) {
 			redealEvent.emit();
 		} else {
 			endOfTurnEvent.emit();
 		}
-		for (Connection c : connections) {
-			c.remove();
-		}
 		view.setSelectedStones(new ArrayList<Stone>());
 	}