diff options
Diffstat (limited to 'src/jrummikub/control/RoundControl.java')
| -rw-r--r-- | src/jrummikub/control/RoundControl.java | 14 |
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(); |