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

1 files changed, 14 insertions, 12 deletions

diff --git a/src/jrummikub/view/impl/StartTurnPanel.java b/src/jrummikub/view/impl/StartTurnPanel.java
index ccbaf91..46e5f0a 100644
--- a/src/jrummikub/view/impl/StartTurnPanel.java
+++ b/src/jrummikub/view/impl/StartTurnPanel.java
@@ -1,5 +1,6 @@
 package jrummikub.view.impl;

 

+import java.awt.Color;

 import java.awt.Insets;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -44,9 +45,7 @@ class StartTurnPanel extends JPanel {
 

 		startTurnLabel = new JLabel();

 		startTurnLabel.setHorizontalAlignment(JLabel.CENTER);

-		startTurnLabel.setHorizontalTextPosition(JLabel.CENTER);

 		startTurnLabel.setVerticalAlignment(JLabel.CENTER);

-		startTurnLabel.setVerticalTextPosition(JLabel.CENTER);

 		startTurnLabel.putClientProperty("html.disable", Boolean.TRUE);

 		add(startTurnLabel);

 

@@ -71,6 +70,10 @@ class StartTurnPanel extends JPanel {
 		startTurnLabel.setText(playerName + " ist jetzt an der Reihe.");

 	}

 

+	void setCurrentPlayerColor(Color color) {

+		startTurnLabel.setIcon(ImageUtil.createColorIcon(color, 12, 1));

+	}

+

 	void setInitialMeldError(int points) {

 		startTurnLabel.setText("Es wurden weniger als " + points

 				+ " Punkte ausgelegt.");

@@ -117,16 +120,15 @@ class StartTurnPanel extends JPanel {
 		}

 

 		switch (type) {

-			case START_TURN_PANEL:

-				startTurnButton.setText("Zug beginnen");

-				buttonEvent = startTurnEvent;

-				break;

-			case INVALID_TURN_PANEL:

-				startTurnLabel

-						.setText("Es liegen ung\u00FCltige Serien auf dem Tisch.");

-				startTurnButton.setText("N\u00E4chster Spieler");

-				buttonEvent = acknowledgeInvalidEvent;

-				break;

+		case START_TURN_PANEL:

+			startTurnButton.setText("Zug beginnen");

+			buttonEvent = startTurnEvent;

+			break;

+		case INVALID_TURN_PANEL:

+			startTurnLabel.setText("Es liegen ung\u00FCltige Serien auf dem Tisch.");

+			startTurnButton.setText("N\u00E4chster Spieler");

+			buttonEvent = acknowledgeInvalidEvent;

+			break;

 		}

 

 	}