From 5246badd681f429c4cd05c9304dde42f5a562f2c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 19 May 2013 20:08:46 +0000 Subject: [PATCH] removed references to CMatch in a few inputs, InputPayCostBase merged with its single descendant --- .gitattributes | 1 - .../java/forge/card/cost/CostPutCounter.java | 22 ++++++++++-- .../forge/card/cost/InputPayCostBase.java | 34 ------------------- .../java/forge/control/input/InputBlock.java | 5 ++- .../control/input/InputPassPriority.java | 3 +- 5 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/forge/card/cost/InputPayCostBase.java diff --git a/.gitattributes b/.gitattributes index 06e7ffbd90c..512ec24fb00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14012,7 +14012,6 @@ src/main/java/forge/card/cost/CostTapType.java -text src/main/java/forge/card/cost/CostUnattach.java -text src/main/java/forge/card/cost/CostUntap.java -text src/main/java/forge/card/cost/CostUntapType.java -text -src/main/java/forge/card/cost/InputPayCostBase.java -text src/main/java/forge/card/cost/PaymentDecision.java -text src/main/java/forge/card/cost/package-info.java svneol=native#text/plain src/main/java/forge/card/mana/IParserManaCost.java -text diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index a21c2588c00..9dd40069778 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -22,14 +22,15 @@ import forge.Card; import forge.CardLists; import forge.CounterType; import forge.FThreads; +import forge.Singletons; import forge.card.ability.AbilityUtils; import forge.card.spellability.SpellAbility; import forge.control.input.InputPayment; +import forge.control.input.InputSyncronizedBase; import forge.game.GameState; import forge.game.ai.ComputerUtilCard; import forge.game.player.Player; import forge.game.zone.ZoneType; -import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; /** @@ -40,7 +41,7 @@ public class CostPutCounter extends CostPartWithList { * TODO: Write javadoc for this type. * */ - public static final class InputPayCostPutCounter extends InputPayCostBase { + public static final class InputPayCostPutCounter extends InputSyncronizedBase implements InputPayment { private final String type; private final CostPutCounter costPutCounter; private final int nNeeded; @@ -58,6 +59,7 @@ public class CostPutCounter extends CostPartWithList { * @param sa */ public InputPayCostPutCounter(String type, CostPutCounter costPutCounter, int nNeeded, SpellAbility sa) { + super(Singletons.getControl().getPlayer()); this.type = type; this.costPutCounter = costPutCounter; this.nNeeded = nNeeded; @@ -81,7 +83,7 @@ public class CostPutCounter extends CostPartWithList { } this.typeList = CardLists.getValidCards(sa.getActivatingPlayer().getCardsIn(ZoneType.Battlefield), type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); - CMatchUI.SINGLETON_INSTANCE.showMessage(msg.toString()); + showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); } @@ -97,6 +99,20 @@ public class CostPutCounter extends CostPartWithList { } } } + + boolean bPaid = false; + + final protected void done() { + bPaid = true; + this.stop(); + } + + @Override + final protected void onCancel() { + this.stop(); + } + + final public boolean isPaid() { return bPaid; } } // Put Counter doesn't really have a "Valid" portion of the cost diff --git a/src/main/java/forge/card/cost/InputPayCostBase.java b/src/main/java/forge/card/cost/InputPayCostBase.java deleted file mode 100644 index 2f49f3ff674..00000000000 --- a/src/main/java/forge/card/cost/InputPayCostBase.java +++ /dev/null @@ -1,34 +0,0 @@ -package forge.card.cost; - -import forge.Singletons; -import forge.control.input.InputPayment; -import forge.control.input.InputSyncronizedBase; - -/** - * TODO: Write javadoc for this type. - * - */ -abstract class InputPayCostBase extends InputSyncronizedBase implements InputPayment { - /** - * TODO: Write javadoc for Constructor. - * @param player - */ - public InputPayCostBase() { - super(Singletons.getControl().getPlayer()); - } - - private static final long serialVersionUID = -2967434867139585579L; - boolean bPaid = false; - - final protected void done() { - bPaid = true; - this.stop(); - } - - @Override - final protected void onCancel() { - this.stop(); - } - - final public boolean isPaid() { return bPaid; } -} \ No newline at end of file diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 5f66cc2b516..11234c391c3 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -29,7 +29,6 @@ import forge.game.player.Player; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.framework.SDisplayUtil; -import forge.gui.match.CMatchUI; import forge.gui.match.views.VMessage; import forge.view.ButtonUtil; @@ -73,14 +72,14 @@ public class InputBlock extends InputBase { final StringBuilder sb = new StringBuilder(); sb.append("To Block, click on your Opponents attacker first, then your blocker(s). "); sb.append("To cancel a block right-click on your blocker"); - CMatchUI.SINGLETON_INSTANCE.showMessage(sb.toString()); + showMessage(sb.toString()); } else { final String attackerName = this.currentAttacker.isFaceDown() ? "Morph" : this.currentAttacker.getName(); final StringBuilder sb = new StringBuilder(); sb.append("Select a creature to block ").append(attackerName).append(" ("); sb.append(this.currentAttacker.getUniqueNumber()).append("). "); sb.append("To cancel a block right-click on your blocker"); - CMatchUI.SINGLETON_INSTANCE.showMessage(sb.toString()); + showMessage(sb.toString()); } CombatUtil.showCombat(game); diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index 73a48751751..84996736b1c 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -25,7 +25,6 @@ import forge.game.player.HumanPlay; import forge.game.player.Player; import forge.gui.GuiDisplayUtil; import forge.gui.framework.SDisplayUtil; -import forge.gui.match.CMatchUI; import forge.gui.match.views.VMessage; import forge.view.ButtonUtil; @@ -69,7 +68,7 @@ public class InputPassPriority extends InputBase { sb.append("\n"); sb.append("Priority: ").append(player); - CMatchUI.SINGLETON_INSTANCE.showMessage(sb.toString()); + showMessage(sb.toString()); }