Rename CMessage to CPrompt to better match tab caption

forge-gui/src/main/java/forge/control/FControl.java

@@ -64,7 +64,7 @@ import forge.gui.match.CMatchUI;
 import forge.gui.match.VMatchUI;
 import forge.gui.match.controllers.CDock;
 import forge.gui.match.controllers.CLog;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.gui.match.controllers.CStack;
 import forge.gui.match.views.VAntes;
 import forge.gui.match.views.VField;
@@ -464,7 +464,7 @@ public enum FControl implements KeyEventDispatcher {
         setCurrentScreen(FScreen.MATCH_SCREEN);
         SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
 
-        CMessage.SINGLETON_INSTANCE.getInputControl().setGame(game);
+        CPrompt.SINGLETON_INSTANCE.getInputControl().setGame(game);
 
         // Listen to DuelOutcome event to show ViewWinLose
         game.subscribeToEvents(fcVisitor);

forge-gui/src/main/java/forge/control/FControlGameEventHandler.java

@@ -51,7 +51,7 @@ import forge.gui.framework.SLayoutIO;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.VMatchUI;
 import forge.gui.match.ViewWinLose;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.gui.match.controllers.CStack;
 import forge.gui.match.views.VField;
 import forge.gui.match.views.VHand;
@@ -121,7 +121,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
                 SDisplayUtil.showTab(nextField);
                 
                 turnUpdPlanned.set(false);
-                CMessage.SINGLETON_INSTANCE.updateText(game);
+                CPrompt.SINGLETON_INSTANCE.updateText(game);
             }
         });
         return null;

forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java

@@ -61,7 +61,7 @@ import forge.gui.input.InputPlayOrDraw;
 import forge.gui.input.InputSelectCards;
 import forge.gui.input.InputSelectCardsFromList;
 import forge.gui.match.CMatchUI;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.gui.toolbox.FSkin;
 import forge.item.PaperCard;
 import forge.properties.ForgePreferences.FPref;
@@ -127,7 +127,7 @@ public class PlayerControllerHuman extends PlayerController {
                     new Runnable() {
         				@Override
         				public void run() {
-        			        CMessage.SINGLETON_INSTANCE.getInputControl().selectAbility(ab);
+        			        CPrompt.SINGLETON_INSTANCE.getInputControl().selectAbility(ab);
         				}
         			}, enabled);
         	if (shortcut > 0) {

forge-gui/src/main/java/forge/gui/framework/EDocID.java

@@ -36,7 +36,7 @@ import forge.gui.match.views.VDetail;
 import forge.gui.match.views.VDev;
 import forge.gui.match.views.VDock;
 import forge.gui.match.views.VLog;
-import forge.gui.match.views.VMessage;
+import forge.gui.match.views.VPrompt;
 import forge.gui.match.views.VPicture;
 import forge.gui.match.views.VPlayers;
 import forge.gui.match.views.VStack;
@@ -88,7 +88,7 @@ public enum EDocID { /** */
     HOME_PLANECHASE (VSubmenuPlanechase.SINGLETON_INSTANCE), /** */
     HOME_RELEASE_NOTES (VSubmenuReleaseNotes.SINGLETON_INSTANCE),
 
-    REPORT_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
+    REPORT_MESSAGE (VPrompt.SINGLETON_INSTANCE), /** */
     REPORT_STACK (VStack.SINGLETON_INSTANCE), /** */
     REPORT_COMBAT (VCombat.SINGLETON_INSTANCE), /** */
     REPORT_LOG (VLog.SINGLETON_INSTANCE), /** */

forge-gui/src/main/java/forge/gui/input/InputBase.java

@@ -26,7 +26,7 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.match.CMatchUI;
-import forge.gui.match.views.VMessage;
+import forge.gui.match.views.VPrompt;
 
 /**
  * <p>
@@ -88,7 +88,7 @@ public abstract class InputBase implements java.io.Serializable, Input {
 
 
     protected final void flashIncorrectAction() {
-        SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE);
+        SDisplayUtil.remind(VPrompt.SINGLETON_INSTANCE);
     }
 
     protected String getTurnPhasePriorityMessage(Game game) {

forge-gui/src/main/java/forge/gui/match/CMatchUI.java

@@ -55,7 +55,7 @@ import forge.gui.framework.IVDoc;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.match.controllers.CCombat;
 import forge.gui.match.controllers.CDetail;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.gui.match.controllers.CPicture;
 import forge.gui.match.menus.CMatchUIMenus;
 import forge.gui.match.views.VCommand;
@@ -210,7 +210,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
 
     /** @param s0   {@link java.lang.String} */
     public void showMessage(final String s0) {
-        CMessage.SINGLETON_INSTANCE.setMessage(s0);
+        CPrompt.SINGLETON_INSTANCE.setMessage(s0);
     }
 
     public VField getFieldViewFor(Player p) {

forge-gui/src/main/java/forge/gui/match/VMatchUI.java

@@ -17,7 +17,7 @@ import forge.gui.match.views.VCommand;
 import forge.gui.match.views.VDev;
 import forge.gui.match.views.VField;
 import forge.gui.match.views.VHand;
-import forge.gui.match.views.VMessage;
+import forge.gui.match.views.VPrompt;
 import forge.properties.ForgePreferences.FPref;
 import forge.view.FView;
 
@@ -75,7 +75,7 @@ public enum VMatchUI implements IVTopLevelUI {
         // Dev mode enabled? May already by added, or put in message cell by default.
         else {
             if (VDev.SINGLETON_INSTANCE.getParentCell() == null) {
-                VMessage.SINGLETON_INSTANCE.getParentCell().addDoc(VDev.SINGLETON_INSTANCE);
+                VPrompt.SINGLETON_INSTANCE.getParentCell().addDoc(VDev.SINGLETON_INSTANCE);
             }
         }
 
@@ -161,12 +161,12 @@ public enum VMatchUI implements IVTopLevelUI {
 
     /** @return {@link javax.swing.JButton} */
     public JButton getBtnCancel() {
-        return VMessage.SINGLETON_INSTANCE.getBtnCancel();
+        return VPrompt.SINGLETON_INSTANCE.getBtnCancel();
     }
 
     /** @return {@link javax.swing.JButton} */
     public JButton getBtnOK() {
-        return VMessage.SINGLETON_INSTANCE.getBtnOK();
+        return VPrompt.SINGLETON_INSTANCE.getBtnOK();
     }
 
     /**

forge-gui/src/main/java/forge/gui/match/controllers/CField.java

@@ -55,7 +55,7 @@ public class CField implements ICDoc {
 
     private final MouseListener madAvatar = new MouseAdapter() { @Override
         public void mousePressed(final MouseEvent e) {
-            CMessage.SINGLETON_INSTANCE.getInputControl().selectPlayer(player); } };
+            CPrompt.SINGLETON_INSTANCE.getInputControl().selectPlayer(player); } };
 
     /**
      * Controls Swing components of a player's field instance.

forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java

@@ -33,21 +33,21 @@ import forge.game.Match;
 import forge.gui.InputProxy;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SDisplayUtil;
-import forge.gui.match.views.VMessage;
+import forge.gui.match.views.VPrompt;
 import forge.gui.toolbox.FSkin;
 
 /**
- * Controls the message panel in the match UI.
+ * Controls the prompt panel in the match UI.
  * 
  * <br><br><i>(C at beginning of class name denotes a control class.)</i>
  */
-public enum CMessage implements ICDoc {
+public enum CPrompt implements ICDoc {
     /** */
     SINGLETON_INSTANCE;
 
     private InputProxy inputControl = new InputProxy();
     private Component lastFocusedButton = null;
-    private VMessage view = VMessage.SINGLETON_INSTANCE;
+    private VPrompt view = VPrompt.SINGLETON_INSTANCE;
 
     private final ActionListener actCancel = new ActionListener() {
         @Override

forge-gui/src/main/java/forge/gui/match/views/VPrompt.java

@@ -31,7 +31,7 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.gui.toolbox.FButton;
 import forge.gui.toolbox.FHtmlViewer;
 import forge.gui.toolbox.FLabel;
@@ -45,7 +45,7 @@ import forge.properties.ForgePreferences.FPref;
  * 
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
-public enum VMessage implements IVDoc<CMessage> {
+public enum VPrompt implements IVDoc<CPrompt> {
     /** */
     SINGLETON_INSTANCE;
 
@@ -62,7 +62,7 @@ public enum VMessage implements IVDoc<CMessage> {
     private final JLabel lblGames;
 
     //========= Constructor
-    private VMessage() {
+    private VPrompt() {
         lblGames = new FLabel.Builder()
         .fontSize(12)
         .fontStyle(Font.PLAIN)
@@ -133,8 +133,8 @@ public enum VMessage implements IVDoc<CMessage> {
      * @see forge.gui.framework.IVDoc#getLayoutControl()
      */
     @Override
-    public CMessage getLayoutControl() {
-        return CMessage.SINGLETON_INSTANCE;
+    public CPrompt getLayoutControl() {
+        return CPrompt.SINGLETON_INSTANCE;
     }
 
     /* (non-Javadoc)

forge-gui/src/main/java/forge/view/arcane/HandArea.java

@@ -22,7 +22,7 @@ import java.awt.event.MouseEvent;
 import javax.swing.JScrollPane;
 
 import forge.gui.match.CMatchUI;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 
 
 /**
@@ -63,14 +63,14 @@ public class HandArea extends CardArea {
     /** {@inheritDoc} */
     @Override
     public final void mouseLeftClicked(final CardPanel panel, final MouseEvent evt) {
-        CMessage.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
+        CPrompt.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
         super.mouseLeftClicked(panel, evt);
     }
     
     /** {@inheritDoc} */
     @Override
     public final void mouseRightClicked(final CardPanel panel, final MouseEvent evt) {
-        CMessage.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
+        CPrompt.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
         super.mouseRightClicked(panel, evt);
     }
 }

forge-gui/src/main/java/forge/view/arcane/PlayArea.java

@@ -30,7 +30,7 @@ import javax.swing.JScrollPane;
 import forge.FThreads;
 import forge.game.card.Card;
 import forge.gui.match.CMatchUI;
-import forge.gui.match.controllers.CMessage;
+import forge.gui.match.controllers.CPrompt;
 import forge.view.arcane.util.Animation;
 import forge.view.arcane.util.CardPanelMouseListener;
 
@@ -501,7 +501,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
     /** {@inheritDoc} */
     @Override
     public final void mouseLeftClicked(final CardPanel panel, final MouseEvent evt) {
-        CMessage.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
+        CPrompt.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
         if ((panel.getTappedAngle() != 0) && (panel.getTappedAngle() != CardPanel.TAPPED_ANGLE)) {
             return;
         }
@@ -511,7 +511,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
     /** {@inheritDoc} */
     @Override
     public final void mouseRightClicked(final CardPanel panel, final MouseEvent evt) {
-        CMessage.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
+        CPrompt.SINGLETON_INSTANCE.getInputControl().selectCard(panel.getCard(), evt);
         super.mouseRightClicked(panel, evt);
     }