From 7420e94876407ffe277d5e8b3ed17a7c40d48f7b Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 30 Nov 2013 18:19:22 +0000 Subject: [PATCH] Rename CMessage to CPrompt to better match tab caption --- .gitattributes | 4 ++-- forge-gui/src/main/java/forge/control/FControl.java | 4 ++-- .../java/forge/control/FControlGameEventHandler.java | 4 ++-- .../java/forge/game/player/PlayerControllerHuman.java | 4 ++-- .../src/main/java/forge/gui/framework/EDocID.java | 4 ++-- forge-gui/src/main/java/forge/gui/input/InputBase.java | 4 ++-- forge-gui/src/main/java/forge/gui/match/CMatchUI.java | 4 ++-- forge-gui/src/main/java/forge/gui/match/VMatchUI.java | 8 ++++---- .../main/java/forge/gui/match/controllers/CField.java | 2 +- .../match/controllers/{CMessage.java => CPrompt.java} | 8 ++++---- .../gui/match/views/{VMessage.java => VPrompt.java} | 10 +++++----- .../src/main/java/forge/view/arcane/HandArea.java | 6 +++--- .../src/main/java/forge/view/arcane/PlayArea.java | 6 +++--- 13 files changed, 34 insertions(+), 34 deletions(-) rename forge-gui/src/main/java/forge/gui/match/controllers/{CMessage.java => CPrompt.java} (95%) rename forge-gui/src/main/java/forge/gui/match/views/{VMessage.java => VPrompt.java} (96%) diff --git a/.gitattributes b/.gitattributes index ea85ba6c9a6..3c4b2f0c7b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15397,9 +15397,9 @@ forge-gui/src/main/java/forge/gui/match/controllers/CDock.java -text forge-gui/src/main/java/forge/gui/match/controllers/CField.java -text forge-gui/src/main/java/forge/gui/match/controllers/CHand.java -text forge-gui/src/main/java/forge/gui/match/controllers/CLog.java -text -forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java -text forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java -text forge-gui/src/main/java/forge/gui/match/controllers/CPlayers.java -text +forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java -text forge-gui/src/main/java/forge/gui/match/controllers/CStack.java -text forge-gui/src/main/java/forge/gui/match/controllers/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java -text @@ -15416,9 +15416,9 @@ forge-gui/src/main/java/forge/gui/match/views/VDock.java -text forge-gui/src/main/java/forge/gui/match/views/VField.java -text forge-gui/src/main/java/forge/gui/match/views/VHand.java -text forge-gui/src/main/java/forge/gui/match/views/VLog.java -text -forge-gui/src/main/java/forge/gui/match/views/VMessage.java -text forge-gui/src/main/java/forge/gui/match/views/VPicture.java -text forge-gui/src/main/java/forge/gui/match/views/VPlayers.java -text +forge-gui/src/main/java/forge/gui/match/views/VPrompt.java -text forge-gui/src/main/java/forge/gui/match/views/VStack.java -text forge-gui/src/main/java/forge/gui/match/views/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/gui/menus/ForgeMenu.java -text diff --git a/forge-gui/src/main/java/forge/control/FControl.java b/forge-gui/src/main/java/forge/control/FControl.java index 0670c4e27a1..0c167bac667 100644 --- a/forge-gui/src/main/java/forge/control/FControl.java +++ b/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); diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index e335b55e8aa..d7d5a1ab6f0 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/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 { SDisplayUtil.showTab(nextField); turnUpdPlanned.set(false); - CMessage.SINGLETON_INSTANCE.updateText(game); + CPrompt.SINGLETON_INSTANCE.updateText(game); } }); return null; diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java index 12c33f6e5f7..22a6f01e8e1 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/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) { diff --git a/forge-gui/src/main/java/forge/gui/framework/EDocID.java b/forge-gui/src/main/java/forge/gui/framework/EDocID.java index 1e0bd95a82c..5510cd89d96 100644 --- a/forge-gui/src/main/java/forge/gui/framework/EDocID.java +++ b/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), /** */ diff --git a/forge-gui/src/main/java/forge/gui/input/InputBase.java b/forge-gui/src/main/java/forge/gui/input/InputBase.java index 81fc8c0b63f..f3addaadea8 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputBase.java +++ b/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; /** *

@@ -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) { diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java index 2ccb1de0c93..031a6a5f984 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/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) { diff --git a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java b/forge-gui/src/main/java/forge/gui/match/VMatchUI.java index e488243053e..28b6e76c351 100644 --- a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java +++ b/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(); } /** diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CField.java b/forge-gui/src/main/java/forge/gui/match/controllers/CField.java index 1cf5bd2e144..6538af3ab5a 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CField.java +++ b/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. diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java b/forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java similarity index 95% rename from forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java rename to forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java index be8c1783858..33828536fe8 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java +++ b/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. * *

(C at beginning of class name denotes a control class.) */ -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 diff --git a/forge-gui/src/main/java/forge/gui/match/views/VMessage.java b/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java similarity index 96% rename from forge-gui/src/main/java/forge/gui/match/views/VMessage.java rename to forge-gui/src/main/java/forge/gui/match/views/VPrompt.java index ae63221581e..81fc3c871ea 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VMessage.java +++ b/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; * *

(V at beginning of class name denotes a view class.) */ -public enum VMessage implements IVDoc { +public enum VPrompt implements IVDoc { /** */ SINGLETON_INSTANCE; @@ -62,7 +62,7 @@ public enum VMessage implements IVDoc { 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 { * @see forge.gui.framework.IVDoc#getLayoutControl() */ @Override - public CMessage getLayoutControl() { - return CMessage.SINGLETON_INSTANCE; + public CPrompt getLayoutControl() { + return CPrompt.SINGLETON_INSTANCE; } /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/view/arcane/HandArea.java b/forge-gui/src/main/java/forge/view/arcane/HandArea.java index d12b2ea71e8..364e95d4f7d 100644 --- a/forge-gui/src/main/java/forge/view/arcane/HandArea.java +++ b/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); } } diff --git a/forge-gui/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui/src/main/java/forge/view/arcane/PlayArea.java index fbf1ae0b9b7..af90d4af137 100644 --- a/forge-gui/src/main/java/forge/view/arcane/PlayArea.java +++ b/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); }