From b2edf7ac90d510e0f947c20294fde9a649d5386c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 26 May 2013 08:58:41 +0000
Subject: [PATCH] added messages in auto-pass and ai inputs

---
 .../forge/card/ability/ai/ChangeZoneAi.java   |  1 -
 .../control/input/InputAutoPassPriority.java  |  1 +
 .../control/input/InputPassPriority.java      | 20 +------------------
 .../control/input/InputPassPriorityBase.java  | 20 ++++++++++++++++++-
 .../java/forge/game/ai/AiInputCommon.java     |  2 ++
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
index a2cb6689c18..dcfe7c466a5 100644
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -39,7 +39,6 @@ import forge.game.phase.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
-import forge.gui.GuiChoose;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 
diff --git a/src/main/java/forge/control/input/InputAutoPassPriority.java b/src/main/java/forge/control/input/InputAutoPassPriority.java
index bed8f37cfdf..1452dbebd0a 100644
--- a/src/main/java/forge/control/input/InputAutoPassPriority.java
+++ b/src/main/java/forge/control/input/InputAutoPassPriority.java
@@ -15,6 +15,7 @@ public class InputAutoPassPriority extends InputPassPriorityBase {
 
     @Override
     public void showMessage() {
+        showMessage(getTurnPhasePriorityMessage());
         pass();
     }
 
diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java
index 669060626de..c25c39971a9 100644
--- a/src/main/java/forge/control/input/InputPassPriority.java
+++ b/src/main/java/forge/control/input/InputPassPriority.java
@@ -19,7 +19,6 @@ package forge.control.input;
 
 import forge.Card;
 import forge.card.spellability.SpellAbility;
-import forge.game.phase.PhaseHandler;
 import forge.game.player.HumanPlay;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
@@ -51,27 +50,10 @@ public class InputPassPriority extends InputPassPriorityBase {
         for (Player p : player.getGame().getRegisteredPlayers()) {
             p.getZone(ZoneType.Battlefield).updateObservers();
         }
+        showMessage(getTurnPhasePriorityMessage());
         ButtonUtil.enableOnlyOk();
-
-        final PhaseHandler ph = player.getGame().getPhaseHandler();
-        final StringBuilder sb = new StringBuilder();
-
-        sb.append("Priority: ").append(player).append("\n").append("\n");
-        sb.append("Turn : ").append(ph.getPlayerTurn()).append("\n");
-        sb.append("Phase: ").append(ph.getPhase().Name).append("\n");
-        sb.append("Stack: ");
-        if (!player.getGame().getStack().isEmpty()) {
-            sb.append(player.getGame().getStack().size()).append(" to Resolve.");
-        } else {
-            sb.append("Empty");
-        }
-        sb.append("\n");
-        
-
-        showMessage(sb.toString());
     }
 
-
     /** {@inheritDoc} */
     @Override
     public final void selectButtonOK() {
diff --git a/src/main/java/forge/control/input/InputPassPriorityBase.java b/src/main/java/forge/control/input/InputPassPriorityBase.java
index 09ab310447d..9f78b190906 100644
--- a/src/main/java/forge/control/input/InputPassPriorityBase.java
+++ b/src/main/java/forge/control/input/InputPassPriorityBase.java
@@ -1,6 +1,7 @@
 package forge.control.input;
 
 import forge.FThreads;
+import forge.game.phase.PhaseHandler;
 import forge.game.player.Player;
 
 public abstract class InputPassPriorityBase extends InputBase {
@@ -19,11 +20,28 @@ public abstract class InputPassPriorityBase extends InputBase {
     
     protected final void pass() { // no futher overloads possible
         setFinished();
-        
 
         if( FThreads.isEDT() )
             FThreads.invokeInNewThread(passPriority);
         else 
             passPriority.run();
     }
+
+    protected String getTurnPhasePriorityMessage() {
+        final PhaseHandler ph = player.getGame().getPhaseHandler();
+        final StringBuilder sb = new StringBuilder();
+    
+        sb.append("Priority: ").append(player).append("\n").append("\n");
+        sb.append("Turn : ").append(ph.getPlayerTurn()).append("\n");
+        sb.append("Phase: ").append(ph.getPhase().Name).append("\n");
+        sb.append("Stack: ");
+        if (!player.getGame().getStack().isEmpty()) {
+            sb.append(player.getGame().getStack().size()).append(" to Resolve.");
+        } else {
+            sb.append("Empty");
+        }
+        sb.append("\n");
+        String message = sb.toString();
+        return message;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/forge/game/ai/AiInputCommon.java b/src/main/java/forge/game/ai/AiInputCommon.java
index 70d34d2a931..d0883388285 100644
--- a/src/main/java/forge/game/ai/AiInputCommon.java
+++ b/src/main/java/forge/game/ai/AiInputCommon.java
@@ -54,6 +54,8 @@ public class AiInputCommon extends InputPassPriorityBase implements AiInput {
             return;
         }
 
+        showMessage(getTurnPhasePriorityMessage());
+        
         /*
          * //put this back in ButtonUtil.disableAll();
          * AllZone.getDisplay().showMessage("Phase: " +