From bc04d21afb9534e3f0aed53045ecc3a30a37bf81 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 31 May 2011 18:25:47 +0200 Subject: View: Refactor bottom panel display git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@354 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/view/IView.java | 55 ++++++++++----------------------------- src/jrummikub/view/impl/View.java | 45 ++++++++++++++------------------ 2 files changed, 34 insertions(+), 66 deletions(-) (limited to 'src/jrummikub/view') diff --git a/src/jrummikub/view/IView.java b/src/jrummikub/view/IView.java index acfd4ac..41dbdf1 100644 --- a/src/jrummikub/view/IView.java +++ b/src/jrummikub/view/IView.java @@ -47,7 +47,7 @@ public interface IView { * Sets the current player's name * * @param playerName - * the player name + * the player name */ public void setCurrentPlayerName(String playerName); @@ -55,18 +55,10 @@ public interface IView { * Sets the stones that are to be painted selected * * @param stones - * the stones to be painted selected + * the stones to be painted selected */ public void setSelectedStones(Collection stones); - /** - * Enables or disables the player's StartTurnPanel - * - * @param enable - * enable/disable - */ - public void enableStartTurnPanel(boolean enable); - /** * The start turn event is emitted when the player wants to start his turn * @@ -74,14 +66,6 @@ public interface IView { */ public IEvent getStartTurnEvent(); - /** - * Enables or disables the panel shown when a player has won - * - * @param enable - * enable/disable - */ - public void enableWinPanel(boolean enable); - /** * The quit event is emitted when the player wants to quit the game * @@ -100,7 +84,7 @@ public interface IView { * Shows or hides the game settings panel * * @param show - * specifies if the panel shall be shown or hidden + * specifies if the panel shall be shown or hidden */ public void showSettingsPanel(boolean show); @@ -108,7 +92,7 @@ public interface IView { * Shows or hides the score panel * * @param show - * specifies if the panel shall be shown or hidden + * specifies if the panel shall be shown or hidden */ public void showScorePanel(boolean show); @@ -117,40 +101,29 @@ public interface IView { * along with the name * * @param color - * the current player's color + * the current player's color */ public void setCurrentPlayerColor(Color color); /** - * Is used for the PlayerPanel to display if a player has laid out along - * with the name + * Is used for the PlayerPanel to display if a player has laid out along with + * the name * * @param hasLaidOut - * specifies if the current player has laid out or not + * specifies if the current player has laid out or not */ - public void setHasLaidOut(boolean hasLaidOut); + public void setCurrentPlayerHasLaidOut(boolean hasLaidOut); /** * Is emitted if the player wants to end the game and start a new one * * @return newGameEvent */ - IEvent getNewGameEvent(); + public IEvent getNewGameEvent(); - /** - * Enables or disables most parts of the interface - * - * @param enable - * specifies if the interface is to be enabled or disabled - */ - void showInterface(boolean enable); + public void setBottomPanel(BottomPanelType type); - /** - * Enables or disables the panel shown while the computer player is making a - * move - * - * @param b - * specifies if the interface is enabled or disabled - */ - public void enableThinkPanel(boolean b); + public enum BottomPanelType { + START_GAME_PANEL, START_TURN_PANEL, HUMAN_HAND_PANEL, COMPUTER_HAND_PANEL, WIN_PANEL + } } diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java index 75b2fc6..45f825a 100644 --- a/src/jrummikub/view/impl/View.java +++ b/src/jrummikub/view/impl/View.java @@ -160,19 +160,15 @@ public class View extends JFrame implements IView { playerPanel.getHandPanel().setSelectedStones(stones); } - @Override - public void enableStartTurnPanel(boolean enable) { - playerPanel.setVisible(!enable); - startTurnPanel.setVisible(enable); - winPanel.setVisible(false); - } - - @Override - public void enableWinPanel(boolean enable) { - playerPanel.setVisible(!enable); - startTurnPanel.setVisible(false); - winPanel.setVisible(enable); - } + /* + * @Override public void enableStartTurnPanel(boolean enable) { + * playerPanel.setVisible(!enable); startTurnPanel.setVisible(enable); + * winPanel.setVisible(false); } + * + * @Override public void enableWinPanel(boolean enable) { + * playerPanel.setVisible(!enable); startTurnPanel.setVisible(false); + * winPanel.setVisible(enable); } + */ @Override public void showSettingsPanel(boolean show) { @@ -196,7 +192,7 @@ public class View extends JFrame implements IView { } @Override - public void setHasLaidOut(boolean hasLaidOut) { + public void setCurrentPlayerHasLaidOut(boolean hasLaidOut) { playerPanel.setHasLaidOut(hasLaidOut); } @@ -260,19 +256,18 @@ public class View extends JFrame implements IView { } @Override - public void showInterface(boolean enable) { - if (enable) { - playerPanel.showButtons(true); - } else { - List> emptyTable = Collections.emptyList(); - table.setStoneSets(emptyTable); + public void setBottomPanel(BottomPanelType type) { + startTurnPanel.setVisible(type == BottomPanelType.START_TURN_PANEL); + winPanel.setVisible(type == BottomPanelType.WIN_PANEL); + playerPanel.setVisible(type != BottomPanelType.START_TURN_PANEL + && type != BottomPanelType.WIN_PANEL); + + if (type == BottomPanelType.START_GAME_PANEL) { + table.setStoneSets(Collections.> emptyList()); playerPanel.getHandPanel().setStones(createDecorationStones()); - playerPanel.showButtons(false); } - } - @Override - public void enableThinkPanel(boolean enable) { - playerPanel.enableButtons(!enable); + playerPanel.showButtons(type != BottomPanelType.START_GAME_PANEL); + playerPanel.enableButtons(type != BottomPanelType.COMPUTER_HAND_PANEL); } } -- cgit v1.2.3