From 024c506522cabd82ca97779c65ab5329cc450935 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 5 Aug 2011 19:46:54 +0400
Subject: [PATCH] Changes UI needs for controlling turn.

---
 .../src/main/java/mage/client/game/FeedbackPanel.java     | 8 ++++++--
 Mage.Client/src/main/java/mage/client/game/GamePanel.java | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
index d7314f9ab2b..a38522ae3df 100644
--- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
@@ -159,6 +159,10 @@ public class FeedbackPanel extends javax.swing.JPanel {
 		logger.debug("feedback - clear");
 	}
 
+	public void clear0() {
+		stopModal();
+	}
+
 	private synchronized void startModal() {
 
         try {
@@ -337,7 +341,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
 
 	private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed
 		this.selected = true;
-		clear();
+		clear0();
 		if (mode == FeedbackMode.SELECT && (evt.getModifiers() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK)
 			session.sendPlayerInteger(gameId, 0);
 		else
@@ -346,7 +350,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
 
 	private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
 		this.selected = true;
-		clear();
+		clear0();
 		session.sendPlayerBoolean(gameId, true);
 	}//GEN-LAST:event_btnLeftActionPerformed
 
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 835d59558c1..5afd2b13a7c 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -643,7 +643,7 @@ public class GamePanel extends javax.swing.JPanel {
 				btnSwitchHandActionPerformed(null);
 			}
 		});
-		btnSwitchHands.setBorder(BorderFactory.createLineBorder(Color.red));
+		//btnSwitchHands.setBorder(BorderFactory.createLineBorder(Color.red));
 
         btnStopWatching.setText("Stop Watching");
         btnStopWatching.addActionListener(new java.awt.event.ActionListener() {
@@ -877,7 +877,7 @@ public class GamePanel extends javax.swing.JPanel {
                     JOptionPane.PLAIN_MESSAGE,
                     null,
                     choices,
-                    YOUR_HAND);
+                    this.chosenHandKey);
 
 		if (chosenHandKey != null && chosenHandKey.length() > 0) {
 			this.chosenHandKey = chosenHandKey;