From ace7175f1a57f3dc88a861842969e84efacf65ad Mon Sep 17 00:00:00 2001
From: Jannis Harder <harder@informatik.uni-luebeck.de>
Date: Mon, 20 Jun 2011 02:19:47 +0200
Subject: Continued side panel

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@499 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/control/RoundControl.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/jrummikub/control/RoundControl.java')

diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index 8dbf236..e18ce2e 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -18,6 +18,7 @@ import jrummikub.model.IHand;
 import jrummikub.model.IPlayer;
 import jrummikub.model.IRoundState;
 import jrummikub.model.ITable;
+import jrummikub.model.Player;
 import jrummikub.model.PlayerSettings;
 import jrummikub.model.Position;
 import jrummikub.model.Score;
@@ -92,6 +93,7 @@ public class RoundControl {
 	 * Continue a saved round after loading
 	 */
 	public void continueRound() {
+		
 		connections.add(view.getStartTurnEvent().add(new IListener() {
 			@Override
 			public void handle() {
@@ -141,6 +143,8 @@ public class RoundControl {
 	}
 
 	protected void doPrepareTurn() {
+		updateSidePanel();
+		
 		boolean isHuman = roundState.getActivePlayer().getPlayerSettings()
 				.getType() == HUMAN;
 		boolean oneHuman = roundState.getGameSettings().oneHuman();
@@ -207,6 +211,18 @@ public class RoundControl {
 
 		turnControl.startTurn();
 	}
+	
+	private void updateSidePanel() {
+		view.showSidePanel(true);
+		view.getSidePanel().setGameSettings(roundState.getGameSettings());
+		List<IPlayer> players = new ArrayList<IPlayer>();
+		for (int i = 1; i < roundState.getPlayerCount(); i ++) {
+			players.add(roundState.getNthNextPlayer(-i));
+		}
+		view.getSidePanel().setPlayers(players);
+		view.getSidePanel().setHeapCapacity(roundState.getGameSettings().getTotalStones());
+		view.getSidePanel().setHeapSize(roundState.getGameHeap().getSize());
+	}
 
 	/** Override this */
 	protected void addTurnControlListeners(ITurnControl turnControl) {
@@ -217,14 +233,12 @@ public class RoundControl {
 	}
 
 	void deal() {
-		view.getSidePanel().setHeapCapacity(roundState.getGameHeap().getSize());
 		for (int i = 0; i < roundState.getPlayerCount(); i++) {
 			IHand hand = roundState.getNthNextPlayer(i).getHand();
 			for (int j = 0; j < roundState.getGameSettings().getNumberOfStonesDealt(); j++) {
 				hand.drop(roundState.getGameHeap().drawStone(), new Position(0, 0));
 			}
 		}
-		view.getSidePanel().setHeapSize(roundState.getGameHeap().getSize());
 		
 	}
 
@@ -410,7 +424,6 @@ public class RoundControl {
 					Hand.WIDTH - 1, rowCount - 1));
 		}
 
-		view.getSidePanel().setHeapSize(roundState.getGameHeap().getSize());
 	}
 
 	private void dealStone() {
-- 
cgit v1.2.3