diff --git a/.gitattributes b/.gitattributes index 1bfe28b462d..67c2c030a39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13815,7 +13815,6 @@ src/main/java/forge/control/input/InputPaySacCost.java -text src/main/java/forge/control/input/InputPayment.java -text src/main/java/forge/control/input/InputSelectMany.java -text src/main/java/forge/control/input/InputSelectManyCards.java -text -src/main/java/forge/control/input/InputSelectManyPlayers.java -text src/main/java/forge/control/input/package-info.java svneol=native#text/plain src/main/java/forge/control/package-info.java -text src/main/java/forge/deck/CardCollections.java -text diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index 366eb670a32..4000848d241 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -495,9 +495,8 @@ public class CardFactoryCreatures { } @Override - protected InputBase onCancel() { + protected void onCancel() { Singletons.getModel().getGame().getAction().sacrifice(card, null); - return null; } @Override @@ -507,11 +506,10 @@ public class CardFactoryCreatures { } // selectCard() @Override - protected InputBase onDone() { + protected void onDone() { for (final Card sac : selected) { Singletons.getModel().getGame().getAction().sacrifice(sac, null); } - return null; } @Override diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index 6c11c2020f0..db970068b66 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -25,7 +25,6 @@ import forge.Card; import forge.CardLists; import forge.Command; import forge.Singletons; -import forge.control.input.InputBase; import forge.control.input.InputSelectManyCards; import forge.game.player.Player; import forge.game.zone.Zone; @@ -76,20 +75,18 @@ class CardFactoryLands { } @Override - protected InputBase onDone() { + protected void onDone() { if (selected.isEmpty()) { - return onCancel(); + onCancel(); } String cardName = selected.get(0).getName(); JOptionPane.showMessageDialog(null, "Revealed card: " + cardName, cardName, JOptionPane.PLAIN_MESSAGE); - return null; } @Override - public InputBase onCancel() { + public void onCancel() { card.setTapped(true); - return null; } } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 02840042c04..f5294e8462f 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -3155,10 +3155,9 @@ public class CardFactoryUtil { private static final long serialVersionUID = 1981791992623774490L; @Override - protected InputBase onDone() { + protected void onDone() { haunterDiesWork.setTargetCard(selected.get(0)); Singletons.getModel().getGame().getStack().add(haunterDiesWork); - return null; } @Override diff --git a/src/main/java/forge/control/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java index ffb184dca00..707d237fb6c 100644 --- a/src/main/java/forge/control/input/InputAttack.java +++ b/src/main/java/forge/control/input/InputAttack.java @@ -132,11 +132,4 @@ public class InputAttack extends InputBase { public void unselectCard(final Card card, final PlayerZone zone) { } - - /* (non-Javadoc) - * @see forge.control.input.Input#isClassUpdated() - */ - @Override - public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputBase.java b/src/main/java/forge/control/input/InputBase.java index cf4a279b219..00bbd3d5461 100644 --- a/src/main/java/forge/control/input/InputBase.java +++ b/src/main/java/forge/control/input/InputBase.java @@ -40,93 +40,28 @@ public abstract class InputBase implements java.io.Serializable { * showMessage. *

*/ - public void showMessage() { - showMessage("Blank Input"); - } + public abstract void showMessage(); + public void selectCard(final Card c) { } + public void selectPlayer(final Player player) { } + public void selectButtonOK() { } + public void selectButtonCancel() { } + + // to remove need for CMatchUI dependence protected void showMessage(String message) { CMatchUI.SINGLETON_INSTANCE.showMessage(message); } - /** - *

- * selectCard. - *

- * - * @param c - * a {@link forge.Card} object. - */ - public void selectCard(final Card c) { - } - - /** - *

- * selectPlayer. - *

- * - * @param player - * a {@link forge.game.player.Player} object. - */ - public void selectPlayer(final Player player) { - } - - /** - *

- * selectButtonOK. - *

- */ - public void selectButtonOK() { - } - - /** - *

- * selectButtonCancel. - *

- */ - public void selectButtonCancel() { - } - - // helper methods, since they are used alot - // to be used by anything in CardFactory like SetTargetInput - // NOT TO BE USED by Input_Main or any of the "regular" Inputs objects that - // are not set using AllZone.getInputControl().setInput(Input) /** *

* stop. *

*/ - public final void stop() { + protected final void stop() { // clears a "temp" Input like Input_PayManaCost if there is one Singletons.getModel().getMatch().getInput().resetInput(); - + afterStop(); // sync inputs will release their latch there } - - // exits the "current" Input and sets the next Input - /** - *

- * stopSetNext. - *

- * - * @param in - * a {@link forge.control.input.InputBase} object. - */ - public final void stopSetNext(final InputBase in) { - this.stop(); - Singletons.getModel().getMatch().getInput().setInput(in); - } - - /** {@inheritDoc} */ - @Override - public String toString() { - return "blank"; - } // returns the Input name like "EmptyStack" - - - /** - * This method is used to mark old descendants of Input - * TODO: Write javadoc for this method. - */ - public /*abstract */void isClassUpdated() { - } //; - + + protected void afterStop() { } } diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 997995ed3f2..e2f172403bf 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -144,11 +144,4 @@ public class InputBlock extends InputBase { this.showMessage(); } // selectCard() - - /* (non-Javadoc) - * @see forge.control.input.Input#isClassUpdated() - */ - @Override - public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java index ff2ebaa1b70..a8d30e9e8d2 100644 --- a/src/main/java/forge/control/input/InputCleanup.java +++ b/src/main/java/forge/control/input/InputCleanup.java @@ -82,18 +82,4 @@ public class InputCleanup extends InputBase { } } } // selectCard() - - /** - *

- * AI_CleanupDiscard. - *

- */ - - - /* (non-Javadoc) - * @see forge.control.input.Input#isClassUpdated() - */ - @Override - public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java index 38d4dbea6d0..30868016fa2 100644 --- a/src/main/java/forge/control/input/InputMulligan.java +++ b/src/main/java/forge/control/input/InputMulligan.java @@ -192,8 +192,4 @@ public class InputMulligan extends InputBase { SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); } } - - @Override - public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index 1b053b917a7..4fe8b4bcf64 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -96,7 +96,4 @@ public class InputPassPriority extends InputBase { SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); } } // selectCard() - - @Override public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputPayDiscardCostWithCommands.java b/src/main/java/forge/control/input/InputPayDiscardCostWithCommands.java index dbb98a7e718..189d0bb7cb9 100644 --- a/src/main/java/forge/control/input/InputPayDiscardCostWithCommands.java +++ b/src/main/java/forge/control/input/InputPayDiscardCostWithCommands.java @@ -187,7 +187,4 @@ public class InputPayDiscardCostWithCommands extends InputBase implements InputP bPaid = false; cdlDone.countDown(); } - - @Override public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputPayManaExecuteCommands.java b/src/main/java/forge/control/input/InputPayManaExecuteCommands.java index 312fea8697a..c65f9edde07 100644 --- a/src/main/java/forge/control/input/InputPayManaExecuteCommands.java +++ b/src/main/java/forge/control/input/InputPayManaExecuteCommands.java @@ -184,8 +184,4 @@ public class InputPayManaExecuteCommands extends InputPayManaBase implements Inp CMatchUI.SINGLETON_INSTANCE.showMessage(msg.toString()); } - - @Override public void isClassUpdated() { - } - } diff --git a/src/main/java/forge/control/input/InputPayManaOfCostPayment.java b/src/main/java/forge/control/input/InputPayManaOfCostPayment.java index 3543b2ae63f..87d6339b40e 100644 --- a/src/main/java/forge/control/input/InputPayManaOfCostPayment.java +++ b/src/main/java/forge/control/input/InputPayManaOfCostPayment.java @@ -117,7 +117,4 @@ public class InputPayManaOfCostPayment extends InputPayManaBase { this.done(); } } - - @Override public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputPayManaSimple.java b/src/main/java/forge/control/input/InputPayManaSimple.java index 599a93b355e..7d24c565bd6 100644 --- a/src/main/java/forge/control/input/InputPayManaSimple.java +++ b/src/main/java/forge/control/input/InputPayManaSimple.java @@ -145,7 +145,4 @@ public class InputPayManaSimple extends InputPayManaBase { } } - - @Override public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputPayManaX.java b/src/main/java/forge/control/input/InputPayManaX.java index 7056ca3b6f0..7bf695e1a6d 100644 --- a/src/main/java/forge/control/input/InputPayManaX.java +++ b/src/main/java/forge/control/input/InputPayManaX.java @@ -92,13 +92,6 @@ public class InputPayManaX extends InputPayManaBase { useManaFromPool(color, this.colorX.isEmpty() ? this.manaCost : new ManaCostBeingPaid(this.colorX)); } - /* (non-Javadoc) - * @see forge.control.input.Input#isClassUpdated() - */ - @Override - public void isClassUpdated() { - } - @Override protected void done() { diff --git a/src/main/java/forge/control/input/InputPayReturnCost.java b/src/main/java/forge/control/input/InputPayReturnCost.java index de44e6a0363..c494aca908c 100644 --- a/src/main/java/forge/control/input/InputPayReturnCost.java +++ b/src/main/java/forge/control/input/InputPayReturnCost.java @@ -187,8 +187,4 @@ public class InputPayReturnCost extends InputBase implements InputPayment { bPaid = false; cdlDone.countDown(); } - - @Override public void isClassUpdated() { - } - } diff --git a/src/main/java/forge/control/input/InputPaySacCost.java b/src/main/java/forge/control/input/InputPaySacCost.java index cba6b0e58da..e380f00e0b7 100644 --- a/src/main/java/forge/control/input/InputPaySacCost.java +++ b/src/main/java/forge/control/input/InputPaySacCost.java @@ -185,7 +185,4 @@ public class InputPaySacCost extends InputBase { } this.unpaid.execute(); } - - @Override public void isClassUpdated() { - } } diff --git a/src/main/java/forge/control/input/InputSelectMany.java b/src/main/java/forge/control/input/InputSelectMany.java index bcad4dae6c9..e304a85405d 100644 --- a/src/main/java/forge/control/input/InputSelectMany.java +++ b/src/main/java/forge/control/input/InputSelectMany.java @@ -65,18 +65,7 @@ public abstract class InputSelectMany extends InputBase { @Override public final void selectButtonCancel() { - // this.stop(); - InputBase next = onCancel(); // might add ability to stack from here - // if ( next != null ) { - // Singletons.getModel().getMatch().getInput().setInput(next); - // } - - if (null == next) { - this.stop(); - } else { - this.stopSetNext(next); - } - + this.stop(); // for a next use selected.clear(); } @@ -87,36 +76,21 @@ public abstract class InputSelectMany extends InputBase { // if an ability is put on stack before this input is stopped; // if it does, uncomment the 5 lines below, use them as method body - // this.stop(); - InputBase next = onDone(); // might add ability to stack from here - // if ( next != null ) { - // Singletons.getModel().getMatch().getInput().setInput(next); - // } - - if (null == next) { - this.stop(); - } else { - this.stopSetNext(next); - } - + this.stop(); // for a next use selected.clear(); } - @Override - public void isClassUpdated() { - } - public void setMessage(String message0) { this.message = message0; // TODO: Add 0 to parameter's name. } // must define these - protected abstract InputBase onDone(); + protected abstract void onDone(); protected abstract boolean isValidChoice(T choice); // might re-define later - protected InputBase onCancel() { return null; } + protected void onCancel() {} protected boolean canCancelWithSomethingSelected() { return false; } protected boolean hasEnoughTargets() { return selected.size() >= min; } protected boolean hasAllTargets() { return selected.size() >= max; } diff --git a/src/main/java/forge/control/input/InputSelectManyPlayers.java b/src/main/java/forge/control/input/InputSelectManyPlayers.java deleted file mode 100644 index 50e2e6a719a..00000000000 --- a/src/main/java/forge/control/input/InputSelectManyPlayers.java +++ /dev/null @@ -1,40 +0,0 @@ -package forge.control.input; - -import java.util.List; - -import com.google.common.base.Function; -import com.google.common.base.Predicate; - -import forge.game.player.Player; - -public class InputSelectManyPlayers extends InputSelectMany { - private static final long serialVersionUID = -8209690791522735L; - - protected final Function, InputBase> onComplete; - private final Predicate allowedFilter; - - public InputSelectManyPlayers(final Predicate allowedRule, int min, int max, final Function, InputBase> onDone) { - - super(min, max); - allowedFilter = allowedRule; - onComplete = onDone; - } - - - @Override - public void selectPlayer(final Player p) { - selectEntity(p); - } - - protected boolean isValidChoice(Player choice) { - if (allowedFilter != null && !allowedFilter.apply(choice)) { - return false; - } - return true; - } - - @Override - protected InputBase onDone() { - return onComplete.apply(selected); - } -} diff --git a/src/main/java/forge/game/ai/AiInputCommon.java b/src/main/java/forge/game/ai/AiInputCommon.java index 7deef471b5f..6af07ce9997 100644 --- a/src/main/java/forge/game/ai/AiInputCommon.java +++ b/src/main/java/forge/game/ai/AiInputCommon.java @@ -73,12 +73,4 @@ public class AiInputCommon extends InputBase { computer.onPriorityRecieved(); } }; - - - - - /* (non-Javadoc) - * @see forge.control.input.Input#isClassUpdated() - */ - @Override public void isClassUpdated() { } } diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java index 22f09c5cc7c..f89caa3dc92 100644 --- a/src/main/java/forge/game/phase/Upkeep.java +++ b/src/main/java/forge/game/phase/Upkeep.java @@ -478,9 +478,8 @@ public class Upkeep extends Phase { }; @Override - protected InputBase onDone() { + protected void onDone() { game.getAction().destroyNoRegeneration(selected.get(0)); - return null; } }; if (player.isHuman() && targets.size() > 0) {