From 25bdce4b67f91536814c34af401d8b239e7b16df Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Thu, 28 Jun 2012 00:53:59 +0400
Subject: [PATCH] Hiding 'End Turn' button

---
 .../src/main/java/mage/client/game/FeedbackPanel.java | 11 +++++------
 .../src/main/java/mage/client/game/GamePanel.java     |  5 ++++-
 .../src/main/java/mage/client/game/HelperPanel.java   |  8 ++++++++
 3 files changed, 17 insertions(+), 7 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 d320fe19e26..4c0db390c91 100644
--- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
@@ -134,18 +134,17 @@ public class FeedbackPanel extends javax.swing.JPanel {
             this.helper.setSpecial("Pay 2 life", true);
         }
 
+        boolean yourTurn = options != null && options.containsKey("your_turn");
+
         requestFocusIfPossible();
         handleOptions(options);
 
         this.revalidate();
         this.repaint();
         this.helper.setLinks(btnLeft, btnRight, btnSpecial);
-//        if (modal) {
-//            this.helper.setVisible(false);
-//            startModal();
-//        } else {
-            this.helper.setVisible(true);
-//        }
+        this.helper.setYourTurn(yourTurn);
+
+        this.helper.setVisible(true);
     }
 
     private void handleOptions(Map<String, Serializable> options) {
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 2cd6bf96653..bafef9d5741 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -557,15 +557,18 @@ public class GamePanel extends javax.swing.JPanel {
     public void select(String message, GameView gameView) {
         updateGame(gameView);
         String messageToDisplay = message;
+        Map<String, Serializable> options = null;
         for (PlayerView playerView : gameView.getPlayers()) {
             if (playerView.getPlayerId().equals(playerId)) {
                 if (playerView.isActive()) {
+                    options = new HashMap<String, Serializable>();
+                    options.put("your_turn", true);
                     messageToDisplay = message + " <div style='font-size:11pt'>Your turn</div>";
                 }
                 break;
             }
         }
-        this.feedbackPanel.getFeedback(FeedbackMode.SELECT, messageToDisplay, gameView.getSpecial(), null);
+        this.feedbackPanel.getFeedback(FeedbackMode.SELECT, messageToDisplay, gameView.getSpecial(), options);
         if (PhaseManager.getInstance().isSkip(gameView, message)) {
             this.feedbackPanel.doClick();
         }
diff --git a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
index 66fd3ee55ce..feea4e7d4b6 100644
--- a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
@@ -176,4 +176,12 @@ public class HelperPanel extends JPanel {
             textArea.setText(message);
         }
     }
+    
+    public void setYourTurn(boolean yourTurn) {
+        if (yourTurn) {
+            btnEndTurn.setVisible(true);
+        } else {
+            btnEndTurn.setVisible(false);
+        }
+    }
 }