diff options
author | Bennet Gerlach <bennet_gerlach@web.de> | 2011-06-19 19:31:55 +0200 |
---|---|---|
committer | Bennet Gerlach <bennet_gerlach@web.de> | 2011-06-19 19:31:55 +0200 |
commit | b875e445308760afbc502517f3b4ab7aa979f2c9 (patch) | |
tree | d76b247fead70d07a558d20eab0f7e4b3ca8328c /src/jrummikub/view/impl/View.java | |
parent | 4231fad826c581040bd6530761731c482e7ff5bd (diff) | |
download | JRummikub-b875e445308760afbc502517f3b4ab7aa979f2c9.tar JRummikub-b875e445308760afbc502517f3b4ab7aa979f2c9.zip |
pause panel and start turn panel now show player color
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@489 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/view/impl/View.java')
-rw-r--r-- | src/jrummikub/view/impl/View.java | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java index caac01f..4911de0 100644 --- a/src/jrummikub/view/impl/View.java +++ b/src/jrummikub/view/impl/View.java @@ -102,12 +102,12 @@ public class View extends JFrame implements IView { public ITablePanel getTablePanel() { return table; } - + @Override public ISidePanel getSidePanel() { return sidePanel; } - + @Override public IHandPanel getHandPanel() { return playerPanel.getHandPanel(); @@ -164,8 +164,7 @@ public class View extends JFrame implements IView { showSettingsPanel(false); showLoginPanel(false); showGameListPanel(false); - getHandPanel().setStones( - Collections.<Pair<Stone, Position>> emptyList()); + getHandPanel().setStones(Collections.<Pair<Stone, Position>> emptyList()); getTablePanel().setStoneSets( Collections.<Pair<StoneSet, Position>> emptyList()); setSelectedStones(Collections.<Stone> emptyList()); @@ -330,8 +329,7 @@ public class View extends JFrame implements IView { table = new TablePanel(); mainLayer.add(table); - table.setBorder(new MatteBorder(0, 0, TABLE_BORDER_WIDTH, 0, - Color.BLACK)); + table.setBorder(new MatteBorder(0, 0, TABLE_BORDER_WIDTH, 0, Color.BLACK)); playerPanel = new PlayerPanel(); mainLayer.add(playerPanel); @@ -380,7 +378,8 @@ public class View extends JFrame implements IView { playerPanel.setBounds(0, tableHeight, width, playerPanelHeight); playerPanel.rescale(); - int sideWidth = sidePanel.isVisible() ? playerPanel.getLeftPanelWidth() + 1 : 0; + int sideWidth = sidePanel.isVisible() ? playerPanel.getLeftPanelWidth() + 1 + : 0; table.setBounds(sideWidth, 0, width - sideWidth, tableHeight); table.validate(); @@ -390,12 +389,11 @@ public class View extends JFrame implements IView { startTurnPanel.setBounds(0, tableHeight, width, playerPanelHeight); pausePanel.setBounds(0, tableHeight, width, playerPanelHeight); winPanel.setBounds(0, tableHeight, width, playerPanelHeight); - - - rescaleSubpanel(settingsPanel, 1 / 2.0, 1/ 2.0, 475, 300); - rescaleSubpanel(scorePanel, 3 / 4.0, 1/ 2.0, 450, 300); - rescaleSubpanel(loginPanel, 1 / 3.0, 1/ 3.0, 200, 200); - rescaleSubpanel(gameListPanel, 1 / 2.0, 1/ 2.0, 475, 300); + + rescaleSubpanel(settingsPanel, 1 / 2.0, 1 / 2.0, 475, 300); + rescaleSubpanel(scorePanel, 3 / 4.0, 1 / 2.0, 450, 300); + rescaleSubpanel(loginPanel, 1 / 3.0, 1 / 3.0, 200, 200); + rescaleSubpanel(gameListPanel, 1 / 2.0, 1 / 2.0, 475, 300); } private void rescaleSubpanel(JPanel sub, double widthFactor, @@ -449,7 +447,7 @@ public class View extends JFrame implements IView { public void showScorePanel(boolean show) { scorePanel.setVisible(show); } - + @Override public void showSidePanel(boolean show) { sidePanel.setVisible(show); @@ -476,6 +474,8 @@ public class View extends JFrame implements IView { @Override public void setCurrentPlayerColor(Color color) { playerPanel.setCurrentPlayerColor(color); + startTurnPanel.setCurrentPlayerColor(color); + pausePanel.setCurrentPlayerColor(color); } @Override @@ -510,24 +510,24 @@ public class View extends JFrame implements IView { @SuppressWarnings("unchecked") private List<Pair<Stone, Position>> createDecorationStones() { - Pair<Stone, Position> stoneJ = new Pair<Stone, Position>(new Stone( - -'J', StoneColor.BLACK), new Position(2.5f, 0)); - Pair<Stone, Position> stoneR = new Pair<Stone, Position>(new Stone( - -'R', StoneColor.ORANGE), new Position(3.5f, 0)); - Pair<Stone, Position> stoneu1 = new Pair<Stone, Position>(new Stone( - -'u', StoneColor.BLUE), new Position(4.5f, 0)); - Pair<Stone, Position> stonem1 = new Pair<Stone, Position>(new Stone( - -'m', StoneColor.RED), new Position(5.5f, 0)); - Pair<Stone, Position> stonem2 = new Pair<Stone, Position>(new Stone( - -'m', StoneColor.GREEN), new Position(6.5f, 0)); - Pair<Stone, Position> stonei = new Pair<Stone, Position>(new Stone( - -'i', StoneColor.VIOLET), new Position(7.5f, 0)); - Pair<Stone, Position> stonek = new Pair<Stone, Position>(new Stone( - -'k', StoneColor.AQUA), new Position(8.5f, 0)); - Pair<Stone, Position> stoneu2 = new Pair<Stone, Position>(new Stone( - -'u', StoneColor.GRAY), new Position(9.5f, 0)); - Pair<Stone, Position> stoneb = new Pair<Stone, Position>(new Stone( - -'b', StoneColor.BLACK), new Position(10.5f, 0)); + Pair<Stone, Position> stoneJ = new Pair<Stone, Position>(new Stone(-'J', + StoneColor.BLACK), new Position(2.5f, 0)); + Pair<Stone, Position> stoneR = new Pair<Stone, Position>(new Stone(-'R', + StoneColor.ORANGE), new Position(3.5f, 0)); + Pair<Stone, Position> stoneu1 = new Pair<Stone, Position>(new Stone(-'u', + StoneColor.BLUE), new Position(4.5f, 0)); + Pair<Stone, Position> stonem1 = new Pair<Stone, Position>(new Stone(-'m', + StoneColor.RED), new Position(5.5f, 0)); + Pair<Stone, Position> stonem2 = new Pair<Stone, Position>(new Stone(-'m', + StoneColor.GREEN), new Position(6.5f, 0)); + Pair<Stone, Position> stonei = new Pair<Stone, Position>(new Stone(-'i', + StoneColor.VIOLET), new Position(7.5f, 0)); + Pair<Stone, Position> stonek = new Pair<Stone, Position>(new Stone(-'k', + StoneColor.AQUA), new Position(8.5f, 0)); + Pair<Stone, Position> stoneu2 = new Pair<Stone, Position>(new Stone(-'u', + StoneColor.GRAY), new Position(9.5f, 0)); + Pair<Stone, Position> stoneb = new Pair<Stone, Position>(new Stone(-'b', + StoneColor.BLACK), new Position(10.5f, 0)); Pair<Stone, Position> stone1 = new Pair<Stone, Position>(new Stone( StoneColor.RED), new Position(2, 1)); @@ -542,9 +542,9 @@ public class View extends JFrame implements IView { Pair<Stone, Position> stone6 = new Pair<Stone, Position>(new Stone( StoneColor.BLACK), new Position(11, 1)); - return Arrays.asList(stoneJ, stoneR, stoneu1, stonem1, stonem2, stonei, - stonek, stoneu2, stoneb, stone1, stone2, stone3, stone4, - stone5, stone6); + return Arrays + .asList(stoneJ, stoneR, stoneu1, stonem1, stonem2, stonei, stonek, + stoneu2, stoneb, stone1, stone2, stone3, stone4, stone5, stone6); } @Override @@ -564,8 +564,7 @@ public class View extends JFrame implements IView { && type != BottomPanelType.WIN_PANEL && type != null); if (type == BottomPanelType.START_GAME_PANEL) { - table.setStoneSets(Collections - .<Pair<StoneSet, Position>> emptyList()); + table.setStoneSets(Collections.<Pair<StoneSet, Position>> emptyList()); playerPanel.getHandPanel().setStones(createDecorationStones()); } |