View: Refactor bottom panel display

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

1 files changed, 6 insertions, 8 deletions

diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index 40894eb..86f8e05 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -1,5 +1,7 @@
 package jrummikub.control;
 
+import static jrummikub.control.turn.TurnControlFactory.Type.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -7,7 +9,6 @@ import java.util.Set;
 
 import jrummikub.control.turn.ITurnControl;
 import jrummikub.control.turn.TurnControlFactory;
-import static jrummikub.control.turn.TurnControlFactory.Type.*;
 import jrummikub.model.Hand;
 import jrummikub.model.IHand;
 import jrummikub.model.IPlayer;
@@ -25,6 +26,7 @@ import jrummikub.util.IEvent1;
 import jrummikub.util.IListener;
 import jrummikub.util.Pair;
 import jrummikub.view.IView;
+import jrummikub.view.IView.BottomPanelType;
 
 /**
  * Controller that manages a single round of rummikub
@@ -82,18 +84,15 @@ public class RoundControl {
 				.getTurnControlType() == HUMAN;
 		clonedTable = (ITable) roundState.getTable().clone();
 
-		if (isHuman) {
-			view.enableStartTurnPanel(true);
-		} else {
-			view.enableThinkPanel(true);
-		}
+		view.setBottomPanel(isHuman ? BottomPanelType.START_TURN_PANEL
+				: BottomPanelType.COMPUTER_HAND_PANEL);
 
 		view.getTablePanel().setStoneSets(clonedTable.clone());
 		view.setCurrentPlayerName(roundState.getActivePlayer().getPlayerSettings()
 				.getName());
 		view.setCurrentPlayerColor(roundState.getActivePlayer().getPlayerSettings()
 				.getColor());
-		view.setHasLaidOut(roundState.getActivePlayer().getLaidOut());
+		view.setCurrentPlayerHasLaidOut(roundState.getActivePlayer().getLaidOut());
 
 		if (!isHuman)
 			startTurn();
@@ -156,7 +155,6 @@ public class RoundControl {
 	}
 
 	private void endOfTurn() {
-		view.enableThinkPanel(false);
 		turnControl = null;
 		if (roundState.getTurnNumber() >= 1) {
 			checkTurn();