From 4f2a4004e3034a9cf187ebdb8a0ca22ba3401fdb Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Thu, 16 Feb 2012 10:55:11 +0000 Subject: [PATCH] Renamed "forge.gui.input" package to "forge.control.input" for consistency and clarity. --- .gitattributes | 24 +++++++++---------- src/main/java/forge/AllZone.java | 6 ++--- src/main/java/forge/CardUtil.java | 2 +- src/main/java/forge/CombatUtil.java | 2 +- src/main/java/forge/ComputerAIInput.java | 2 +- src/main/java/forge/ComputerUtil.java | 2 +- src/main/java/forge/GameAction.java | 8 +++---- src/main/java/forge/GameActionUtil.java | 4 ++-- src/main/java/forge/GuiInput.java | 4 ++-- src/main/java/forge/HumanPlayer.java | 2 +- src/main/java/forge/MagicStack.java | 4 ++-- src/main/java/forge/PlayerUtil.java | 18 +++++++------- src/main/java/forge/Untap.java | 2 +- src/main/java/forge/Upkeep.java | 2 +- .../AbilityFactoryCounters.java | 2 +- .../abilityfactory/AbilityFactoryMana.java | 2 +- .../card/cardfactory/AbstractCardFactory.java | 4 ++-- .../card/cardfactory/CardFactoryAuras.java | 2 +- .../cardfactory/CardFactoryCreatures.java | 4 ++-- .../card/cardfactory/CardFactoryLands.java | 2 +- .../cardfactory/CardFactorySorceries.java | 6 ++--- .../card/cardfactory/CardFactoryUtil.java | 24 +++++++++---------- .../java/forge/card/cost/CostDiscard.java | 4 ++-- src/main/java/forge/card/cost/CostExile.java | 6 ++--- src/main/java/forge/card/cost/CostMana.java | 10 ++++---- .../java/forge/card/cost/CostPutCounter.java | 4 ++-- src/main/java/forge/card/cost/CostReturn.java | 6 ++--- src/main/java/forge/card/cost/CostReveal.java | 4 ++-- .../java/forge/card/cost/CostSacrifice.java | 6 ++--- .../java/forge/card/cost/CostTapType.java | 4 ++-- src/main/java/forge/card/cost/CostUtil.java | 4 ++-- src/main/java/forge/card/mana/Mana.java | 2 +- src/main/java/forge/card/mana/ManaCost.java | 2 +- .../java/forge/card/mana/ManaPartColor.java | 2 +- .../java/forge/card/mana/ManaPartSplit.java | 2 +- src/main/java/forge/card/mana/ManaPool.java | 2 +- .../forge/card/spellability/SpellAbility.java | 14 +++++------ .../card/spellability/SpellPermanent.java | 2 +- .../card/spellability/TargetSelection.java | 4 ++-- .../forge/card/trigger/TriggerHandler.java | 2 +- .../forge/{gui => control}/input/Input.java | 4 ++-- .../{gui => control}/input/InputAttack.java | 2 +- .../{gui => control}/input/InputBlock.java | 2 +- .../{gui => control}/input/InputCleanup.java | 2 +- .../{gui => control}/input/InputControl.java | 12 +++++----- .../{gui => control}/input/InputMana.java | 2 +- .../{gui => control}/input/InputMulligan.java | 2 +- .../input/InputPassPriority.java | 2 +- .../input/InputPayManaCost.java | 4 ++-- .../input/InputPayManaCostAbility.java | 4 ++-- .../input/InputPayManaCostUtil.java | 2 +- .../forge/control/input/package-info.java | 3 +++ .../forge/control/match/ControlField.java | 12 +++++----- .../java/forge/gui/input/package-info.java | 3 --- src/main/java/forge/model/FModel.java | 2 +- src/test/java/forge/RunTest.java | 2 +- 56 files changed, 134 insertions(+), 134 deletions(-) rename src/main/java/forge/{gui => control}/input/Input.java (97%) rename src/main/java/forge/{gui => control}/input/InputAttack.java (99%) rename src/main/java/forge/{gui => control}/input/InputBlock.java (99%) rename src/main/java/forge/{gui => control}/input/InputCleanup.java (99%) rename src/main/java/forge/{gui => control}/input/InputControl.java (95%) rename src/main/java/forge/{gui => control}/input/InputMana.java (88%) rename src/main/java/forge/{gui => control}/input/InputMulligan.java (99%) rename src/main/java/forge/{gui => control}/input/InputPassPriority.java (99%) rename src/main/java/forge/{gui => control}/input/InputPayManaCost.java (99%) rename src/main/java/forge/{gui => control}/input/InputPayManaCostAbility.java (98%) rename src/main/java/forge/{gui => control}/input/InputPayManaCostUtil.java (99%) create mode 100644 src/main/java/forge/control/input/package-info.java delete mode 100644 src/main/java/forge/gui/input/package-info.java diff --git a/.gitattributes b/.gitattributes index f877b5f60ce..86fca49a8d4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11161,6 +11161,18 @@ src/main/java/forge/control/home/ControlSealed.java -text src/main/java/forge/control/home/ControlSettings.java -text src/main/java/forge/control/home/ControlUtilities.java -text src/main/java/forge/control/home/package-info.java -text svneol=native#text/plain +src/main/java/forge/control/input/Input.java svneol=native#text/plain +src/main/java/forge/control/input/InputAttack.java svneol=native#text/plain +src/main/java/forge/control/input/InputBlock.java svneol=native#text/plain +src/main/java/forge/control/input/InputCleanup.java svneol=native#text/plain +src/main/java/forge/control/input/InputControl.java svneol=native#text/plain +src/main/java/forge/control/input/InputMana.java -text +src/main/java/forge/control/input/InputMulligan.java svneol=native#text/plain +src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain +src/main/java/forge/control/input/InputPayManaCost.java svneol=native#text/plain +src/main/java/forge/control/input/InputPayManaCostAbility.java svneol=native#text/plain +src/main/java/forge/control/input/InputPayManaCostUtil.java svneol=native#text/plain +src/main/java/forge/control/input/package-info.java svneol=native#text/plain src/main/java/forge/control/match/ControlDetail.java -text src/main/java/forge/control/match/ControlDock.java -text src/main/java/forge/control/match/ControlField.java -text @@ -11242,18 +11254,6 @@ src/main/java/forge/gui/game/CardDetailPanel.java svneol=native#text/plain src/main/java/forge/gui/game/CardPanel.java svneol=native#text/plain src/main/java/forge/gui/game/CardPicturePanel.java svneol=native#text/plain src/main/java/forge/gui/game/package-info.java svneol=native#text/plain -src/main/java/forge/gui/input/Input.java svneol=native#text/plain -src/main/java/forge/gui/input/InputAttack.java svneol=native#text/plain -src/main/java/forge/gui/input/InputBlock.java svneol=native#text/plain -src/main/java/forge/gui/input/InputCleanup.java svneol=native#text/plain -src/main/java/forge/gui/input/InputControl.java svneol=native#text/plain -src/main/java/forge/gui/input/InputMana.java -text -src/main/java/forge/gui/input/InputMulligan.java svneol=native#text/plain -src/main/java/forge/gui/input/InputPassPriority.java svneol=native#text/plain -src/main/java/forge/gui/input/InputPayManaCost.java svneol=native#text/plain -src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/plain -src/main/java/forge/gui/input/InputPayManaCostUtil.java svneol=native#text/plain -src/main/java/forge/gui/input/package-info.java svneol=native#text/plain src/main/java/forge/gui/package-info.java svneol=native#text/plain src/main/java/forge/item/BoosterPack.java -text src/main/java/forge/item/CardDb.java -text diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index b9640bcde2f..168a7c0a89a 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -26,9 +26,9 @@ import forge.card.cardfactory.CardFactoryInterface; import forge.card.cardfactory.PreloadingCardFactory; import forge.card.replacement.ReplacementHandler; import forge.card.trigger.TriggerHandler; +import forge.control.input.InputControl; import forge.deck.DeckManager; import forge.game.limited.CardRatings; -import forge.gui.input.InputControl; import forge.model.FGameState; import forge.model.FMatchState; import forge.properties.ForgeProps; @@ -367,14 +367,14 @@ public final class AllZone { * getInputControl. *

* - * @return a {@link forge.gui.input.InputControl} object. + * @return a {@link forge.control.input.InputControl} object. * @since 1.0.15 */ public static InputControl getInputControl() { return AllZone.inputControl; } - /** @param i0   {@link forge.gui.input.InputControl} */ + /** @param i0   {@link forge.control.input.InputControl} */ public static void setInputControl(InputControl i0) { AllZone.inputControl = i0; } diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 937f9578a90..38eb923af38 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -34,7 +34,7 @@ import forge.card.CardCharacteristics; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbilityList; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants; diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index a474ada2120..5b1a1884163 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -31,8 +31,8 @@ import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; +import forge.control.input.InputPayManaCostAbility; import forge.gui.GuiUtils; -import forge.gui.input.InputPayManaCostAbility; /** *

diff --git a/src/main/java/forge/ComputerAIInput.java b/src/main/java/forge/ComputerAIInput.java index e47b37d3ce0..2edcf296a18 100644 --- a/src/main/java/forge/ComputerAIInput.java +++ b/src/main/java/forge/ComputerAIInput.java @@ -19,7 +19,7 @@ package forge; import com.esotericsoftware.minlog.Log; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java index fcf841ca8f2..8f2f7b341e3 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/ComputerUtil.java @@ -36,8 +36,8 @@ import forge.card.spellability.AbilityMana; import forge.card.spellability.AbilityStatic; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; +import forge.control.input.InputPayManaCostUtil; import forge.error.ErrorViewer; -import forge.gui.input.InputPayManaCostUtil; /** *

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 12de4aa76c5..27d7c6810da 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -46,15 +46,15 @@ import forge.card.spellability.Target; import forge.card.spellability.TargetSelection; import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; +import forge.control.input.InputMulligan; +import forge.control.input.InputPayManaCost; +import forge.control.input.InputPayManaCostAbility; +import forge.control.input.InputPayManaCostUtil; import forge.deck.Deck; import forge.game.GameEndReason; import forge.game.GameSummary; import forge.game.GameType; import forge.gui.GuiUtils; -import forge.gui.input.InputMulligan; -import forge.gui.input.InputPayManaCost; -import forge.gui.input.InputPayManaCostAbility; -import forge.gui.input.InputPayManaCostUtil; import forge.item.CardPrinted; import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 1d7fc8ef5c5..48deef9de6e 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -29,10 +29,10 @@ import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; +import forge.control.input.InputPayManaCostAbility; +import forge.control.input.InputPayManaCostUtil; import forge.game.GameLossReason; import forge.gui.GuiUtils; -import forge.gui.input.InputPayManaCostAbility; -import forge.gui.input.InputPayManaCostUtil; import forge.util.MyRandom; /** diff --git a/src/main/java/forge/GuiInput.java b/src/main/java/forge/GuiInput.java index d3469a67a55..89aa94f7b15 100644 --- a/src/main/java/forge/GuiInput.java +++ b/src/main/java/forge/GuiInput.java @@ -20,7 +20,7 @@ package forge; import java.util.Observable; import java.util.Observer; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

@@ -61,7 +61,7 @@ public class GuiInput extends MyObservable implements Observer { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ private void setInput(final Input in) { this.input = in; diff --git a/src/main/java/forge/HumanPlayer.java b/src/main/java/forge/HumanPlayer.java index 2c8fb9efdb7..7eee30f96bc 100644 --- a/src/main/java/forge/HumanPlayer.java +++ b/src/main/java/forge/HumanPlayer.java @@ -19,8 +19,8 @@ package forge; import forge.Constant.Zone; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** *

diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 7ec74439bdc..ba62473229a 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -41,9 +41,9 @@ import forge.card.spellability.Target; import forge.card.spellability.TargetChoices; import forge.card.spellability.TargetSelection; import forge.card.trigger.Trigger; +import forge.control.input.Input; +import forge.control.input.InputPayManaCostAbility; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputPayManaCostAbility; /** *

diff --git a/src/main/java/forge/PlayerUtil.java b/src/main/java/forge/PlayerUtil.java index 224c7c9e397..f01fbb9df56 100644 --- a/src/main/java/forge/PlayerUtil.java +++ b/src/main/java/forge/PlayerUtil.java @@ -19,7 +19,7 @@ package forge; import forge.Constant.Zone; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

@@ -69,7 +69,7 @@ public final class PlayerUtil { * a {@link java.lang.String} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputDiscardNumUnless(final int nCards, final String uType, final SpellAbility sa) { @@ -125,7 +125,7 @@ public final class PlayerUtil { * a int. * @param sa * a {@link forge.card.spellability.SpellAbility} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputDiscard(final int nCards, final SpellAbility sa) { @@ -171,7 +171,7 @@ public final class PlayerUtil { * input_chainsDiscard. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputChainsDiscard() { final Input target = new Input() { @@ -213,7 +213,7 @@ public final class PlayerUtil { * a {@link forge.CardList} object. * @param message * a {@link java.lang.String} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputSacrificePermanent(final CardList choices, final String message) { @@ -227,7 +227,7 @@ public final class PlayerUtil { * * @param nCards * a int. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputSacrificePermanents(final int nCards) { @@ -244,7 +244,7 @@ public final class PlayerUtil { * a int. * @param type * a {@link java.lang.String} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputSacrificePermanents(final int nCards, final String type) { @@ -265,7 +265,7 @@ public final class PlayerUtil { * a {@link forge.CardList} object. * @param message * a {@link java.lang.String} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputSacrificePermanentsFromList(final int nCards, final CardList list, final String message) { @@ -314,7 +314,7 @@ public final class PlayerUtil { * a {@link java.lang.String} object. * @param num * a int. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. * @since 1.0.15 */ public static Input inputPutFromHandToLibrary(final String topOrBottom, final int num) { diff --git a/src/main/java/forge/Untap.java b/src/main/java/forge/Untap.java index 54386e81e85..66bdade839d 100644 --- a/src/main/java/forge/Untap.java +++ b/src/main/java/forge/Untap.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index da87c7484d3..42e111e3159 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -25,8 +25,8 @@ import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; import forge.card.spellability.AbilityStatic; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 92f33ec9f6a..da436cc8740 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -45,8 +45,8 @@ import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; import forge.util.MyRandom; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java index e7ea4334b6b..1924efcba35 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java @@ -39,8 +39,8 @@ import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; +import forge.control.input.InputPayManaCostUtil; import forge.gui.GuiUtils; -import forge.gui.input.InputPayManaCostUtil; import forge.util.MyRandom; /** diff --git a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java index 543e4d12cee..c973b52fe96 100644 --- a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java @@ -53,10 +53,10 @@ import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; +import forge.control.input.Input; +import forge.control.input.InputPayManaCost; import forge.game.GameLossReason; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputPayManaCost; import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.util.FileUtil; diff --git a/src/main/java/forge/card/cardfactory/CardFactoryAuras.java b/src/main/java/forge/card/cardfactory/CardFactoryAuras.java index 8e959f0af13..df08e427b2d 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryAuras.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryAuras.java @@ -39,8 +39,8 @@ import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** *

diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index de109b8660b..ab6c5a835f4 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -52,9 +52,9 @@ import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; +import forge.control.input.Input; +import forge.control.input.InputPayManaCost; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputPayManaCost; import forge.util.MyRandom; /** diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index bf933a96011..35d3f4d4f5c 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -38,8 +38,8 @@ import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; import forge.util.MyRandom; /** diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java index 3f4318ff169..2ca8f51b2c4 100644 --- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java +++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java @@ -48,10 +48,10 @@ import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; +import forge.control.input.Input; +import forge.control.input.InputPayManaCost; +import forge.control.input.InputPayManaCostAbility; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputPayManaCost; -import forge.gui.input.InputPayManaCostAbility; /** *

diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 540e98a5653..db0372e9315 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -63,10 +63,10 @@ import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; +import forge.control.input.Input; +import forge.control.input.InputPayManaCost; +import forge.control.input.InputPayManaCostUtil; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputPayManaCost; -import forge.gui.input.InputPayManaCostUtil; import forge.util.MyRandom; /** @@ -794,7 +794,7 @@ public class CardFactoryUtil { * a {@link forge.CardList} object. * @param free * a boolean. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputSpell(final SpellAbility spell, final CardList choices, final boolean free) { final Input target = new Input() { @@ -848,7 +848,7 @@ public class CardFactoryUtil { * a {@link forge.CardList} object. * @param message * a {@link java.lang.String} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputDestroyNoRegeneration(final CardList choices, final String message) { final Input target = new Input() { @@ -1717,7 +1717,7 @@ public class CardFactoryUtil { * a boolean. * @param free * a boolean. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputTargetSpecific(final SpellAbility spell, final CardList choices, final String message, final boolean targeted, final boolean free) { @@ -1742,7 +1742,7 @@ public class CardFactoryUtil { * a boolean. * @param free * a boolean. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputTargetSpecific(final SpellAbility spell, final CardList choices, final String message, final Command paid, final boolean targeted, final boolean free) { @@ -1799,7 +1799,7 @@ public class CardFactoryUtil { * a boolean. * @param free * a boolean. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputTargetChampionSac(final Card crd, final SpellAbility spell, final CardList choices, final String message, final boolean targeted, final boolean free) { @@ -1849,7 +1849,7 @@ public class CardFactoryUtil { * * @param equip * a {@link forge.card.spellability.SpellAbility} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputEquipCreature(final SpellAbility equip) { final Input runtime = new Input() { @@ -1941,7 +1941,7 @@ public class CardFactoryUtil { * a {@link forge.CardList} object. * @param paid * a {@link forge.Command} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input masterOfTheWildHuntInputTargetCreature(final SpellAbility spell, final CardList choices, final Command paid) { @@ -1985,7 +1985,7 @@ public class CardFactoryUtil { * a {@link forge.card.spellability.SpellAbility} object. * @param card * a {@link forge.Card} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input modularInput(final SpellAbility ability, final Card card) { final Input modularInput = new Input() { @@ -3496,7 +3496,7 @@ public class CardFactoryUtil { * a int. * @param type * a {@link java.lang.String} object. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputUntapUpToNType(final int n, final String type) { final Input untap = new Input() { diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index 7c46fffc99f..5b2b662eb12 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/src/main/java/forge/card/cost/CostDiscard.java @@ -30,7 +30,7 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** * The Class CostDiscard. @@ -294,7 +294,7 @@ public class CostDiscard extends CostPartWithList { * @param nNeeded * a int. * - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputDiscardCost(final String discType, final CardList handList, final SpellAbility sa, final CostPayment payment, final CostDiscard part, final int nNeeded) { diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 88b1d4331ba..d7db1788e25 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -34,8 +34,8 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** * The Class CostExile. @@ -379,7 +379,7 @@ public class CostExile extends CostPartWithList { * a {@link forge.card.cost.CostPayment} object. * @param nNeeded * the n needed - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input exileType(final SpellAbility sa, final CostExile part, final String type, final CostPayment payment, final int nNeeded) { @@ -463,7 +463,7 @@ public class CostExile extends CostPartWithList { * a {@link forge.card.cost.CostPayment} object. * @param part * the part - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input exileThis(final SpellAbility sa, final CostPayment payment, final CostExile part) { final Input target = new Input() { diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 8386fdf5da9..44a24578a7e 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -31,9 +31,9 @@ import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; -import forge.gui.input.InputMana; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.Input; +import forge.control.input.InputMana; +import forge.control.input.InputPayManaCostUtil; /** * The Class CostMana. @@ -251,7 +251,7 @@ public class CostMana extends CostPart { * @param numX * a int. * - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputPayXMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana, final int numX) { @@ -352,7 +352,7 @@ public class CostMana extends CostPart { * the cost mana * @param manaToAdd * a int. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputPayMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana, final int manaToAdd) { diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index 6c39df3578e..05c3f7605c3 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -28,7 +28,7 @@ import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** * The Class CostPutCounter. @@ -243,7 +243,7 @@ public class CostPutCounter extends CostPartWithList { * TODO * @param nNeeded * the n needed - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input putCounterType(final SpellAbility sa, final String type, final CostPayment payment, final CostPutCounter costPutCounter, final int nNeeded) { diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index d9667462bbf..5daee6cbfdc 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/src/main/java/forge/card/cost/CostReturn.java @@ -31,7 +31,7 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** * The Class CostReturn. @@ -206,7 +206,7 @@ public class CostReturn extends CostPartWithList { * TODO * @param nNeeded * the n needed - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input returnType(final SpellAbility sa, final String type, final CostPayment payment, final CostReturn part, final int nNeeded) { @@ -286,7 +286,7 @@ public class CostReturn extends CostPartWithList { * a {@link forge.card.cost.CostPayment} object. * @param part * TODO - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input returnThis(final SpellAbility sa, final CostPayment payment, final CostReturn part) { final Input target = new Input() { diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index 61c428f714e..c09c2ee145b 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -29,8 +29,8 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** * The Class CostReveal. @@ -226,7 +226,7 @@ public class CostReveal extends CostPartWithList { * TODO * @param nNeeded * a int. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputRevealCost(final String discType, final CardList handList, final CostPayment payment, final CostReveal part, final SpellAbility sa, final int nNeeded) { diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index db97bbf2935..fa8f0fada9e 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -31,7 +31,7 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** * The Class CostSacrifice. @@ -252,7 +252,7 @@ public class CostSacrifice extends CostPartWithList { * TODO * @param nNeeded * the n needed - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input sacrificeFromList(final SpellAbility sa, final CostPayment payment, final CostSacrifice part, final CardList typeList, final int nNeeded) { @@ -329,7 +329,7 @@ public class CostSacrifice extends CostPartWithList { * a {@link forge.card.cost.CostPayment} object. * @param part * TODO - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input sacrificeThis(final SpellAbility sa, final CostPayment payment, final CostSacrifice part) { final Input target = new Input() { diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 22cf98ea9d1..c0ffce6d7d6 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -29,7 +29,7 @@ import forge.PlayerZone; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; -import forge.gui.input.Input; +import forge.control.input.Input; /** * The Class CostTapType. @@ -223,7 +223,7 @@ public class CostTapType extends CostPartWithList { * a {@link forge.card.cost.CostPayment} object. * @param nCards * a int. - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public static Input inputTapXCost(final CostTapType tapType, final CardList cardList, final SpellAbility sa, final CostPayment payment, final int nCards) { diff --git a/src/main/java/forge/card/cost/CostUtil.java b/src/main/java/forge/card/cost/CostUtil.java index c6b2daca975..99b540f26ad 100644 --- a/src/main/java/forge/card/cost/CostUtil.java +++ b/src/main/java/forge/card/cost/CostUtil.java @@ -27,8 +27,8 @@ import forge.Constant.Zone; import forge.Counters; import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** * The Class CostUtil. @@ -315,7 +315,7 @@ public class CostUtil { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public static void setInput(final Input in) { // Just a shortcut.. diff --git a/src/main/java/forge/card/mana/Mana.java b/src/main/java/forge/card/mana/Mana.java index ba028aa8480..6ffa022a61e 100644 --- a/src/main/java/forge/card/mana/Mana.java +++ b/src/main/java/forge/card/mana/Mana.java @@ -19,7 +19,7 @@ package forge.card.mana; import forge.Card; import forge.Constant; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; /** *

diff --git a/src/main/java/forge/card/mana/ManaCost.java b/src/main/java/forge/card/mana/ManaCost.java index 3f36a5ec148..d5b68bd4eb4 100644 --- a/src/main/java/forge/card/mana/ManaCost.java +++ b/src/main/java/forge/card/mana/ManaCost.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.StringTokenizer; import forge.Constant; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; /** *

diff --git a/src/main/java/forge/card/mana/ManaPartColor.java b/src/main/java/forge/card/mana/ManaPartColor.java index 732af3c3d82..d814391b63e 100644 --- a/src/main/java/forge/card/mana/ManaPartColor.java +++ b/src/main/java/forge/card/mana/ManaPartColor.java @@ -17,7 +17,7 @@ */ package forge.card.mana; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; /** *

diff --git a/src/main/java/forge/card/mana/ManaPartSplit.java b/src/main/java/forge/card/mana/ManaPartSplit.java index fae460eac33..fa2ad5c8550 100644 --- a/src/main/java/forge/card/mana/ManaPartSplit.java +++ b/src/main/java/forge/card/mana/ManaPartSplit.java @@ -17,7 +17,7 @@ */ package forge.card.mana; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; //handles mana costs like 2/R or 2/B //for cards like Flame Javelin (Shadowmoor) diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java index 7430edb859b..92fc70c1b64 100644 --- a/src/main/java/forge/card/mana/ManaPool.java +++ b/src/main/java/forge/card/mana/ManaPool.java @@ -29,8 +29,8 @@ import forge.Constant; import forge.Player; import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; +import forge.control.input.InputPayManaCostUtil; import forge.gui.GuiUtils; -import forge.gui.input.InputPayManaCostUtil; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index b3ae9f19ae7..65037e99441 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -29,7 +29,7 @@ import forge.Player; import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.mana.Mana; -import forge.gui.input.Input; +import forge.control.input.Input; //only SpellAbility can go on the stack //override any methods as needed @@ -613,7 +613,7 @@ public abstract class SpellAbility { * Getter for the field beforePayMana. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public Input getBeforePayMana() { return this.beforePayMana; @@ -625,7 +625,7 @@ public abstract class SpellAbility { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public void setBeforePayMana(final Input in) { this.beforePayMana = in; @@ -636,7 +636,7 @@ public abstract class SpellAbility { * Getter for the field afterPayMana. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public Input getAfterPayMana() { return this.afterPayMana; @@ -648,7 +648,7 @@ public abstract class SpellAbility { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public void setAfterPayMana(final Input in) { this.afterPayMana = in; @@ -1041,7 +1041,7 @@ public abstract class SpellAbility { * Getter for the field afterResolve. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public Input getAfterResolve() { return this.afterResolve; @@ -1053,7 +1053,7 @@ public abstract class SpellAbility { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public void setAfterResolve(final Input in) { this.afterResolve = in; diff --git a/src/main/java/forge/card/spellability/SpellPermanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java index 44db359d838..03932e75f6f 100644 --- a/src/main/java/forge/card/spellability/SpellPermanent.java +++ b/src/main/java/forge/card/spellability/SpellPermanent.java @@ -35,7 +35,7 @@ import forge.card.abilityfactory.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.trigger.Trigger; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index 7540b2a7d46..5281c03a4d1 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -31,8 +31,8 @@ import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; import forge.Singletons; +import forge.control.input.Input; import forge.gui.GuiUtils; -import forge.gui.input.Input; /** *

@@ -307,7 +307,7 @@ public class TargetSelection { * a boolean. * @param alreadyTargeted * the already targeted - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public final Input inputTargetSpecific(final CardList choices, final boolean targeted, final boolean mandatory, final ArrayList alreadyTargeted) { diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index d3acb6bd452..4957205aeb8 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -41,7 +41,7 @@ import forge.card.spellability.AbilitySub; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbilityRestriction; import forge.card.spellability.Target; -import forge.gui.input.Input; +import forge.control.input.Input; /** *

diff --git a/src/main/java/forge/gui/input/Input.java b/src/main/java/forge/control/input/Input.java similarity index 97% rename from src/main/java/forge/gui/input/Input.java rename to src/main/java/forge/control/input/Input.java index 77f14ce9867..40788b032f4 100644 --- a/src/main/java/forge/gui/input/Input.java +++ b/src/main/java/forge/control/input/Input.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.Card; @@ -114,7 +114,7 @@ public abstract class Input implements java.io.Serializable { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public final void stopSetNext(final Input in) { this.stop(); diff --git a/src/main/java/forge/gui/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java similarity index 99% rename from src/main/java/forge/gui/input/InputAttack.java rename to src/main/java/forge/control/input/InputAttack.java index 3392a11a687..7f2809cb963 100644 --- a/src/main/java/forge/gui/input/InputAttack.java +++ b/src/main/java/forge/control/input/InputAttack.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.ButtonUtil; diff --git a/src/main/java/forge/gui/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java similarity index 99% rename from src/main/java/forge/gui/input/InputBlock.java rename to src/main/java/forge/control/input/InputBlock.java index 868a884b79e..74cd3c10c37 100644 --- a/src/main/java/forge/gui/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import java.util.ArrayList; diff --git a/src/main/java/forge/gui/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java similarity index 99% rename from src/main/java/forge/gui/input/InputCleanup.java rename to src/main/java/forge/control/input/InputCleanup.java index 063e39330a6..90a4b211fb8 100644 --- a/src/main/java/forge/gui/input/InputCleanup.java +++ b/src/main/java/forge/control/input/InputCleanup.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.ButtonUtil; diff --git a/src/main/java/forge/gui/input/InputControl.java b/src/main/java/forge/control/input/InputControl.java similarity index 95% rename from src/main/java/forge/gui/input/InputControl.java rename to src/main/java/forge/control/input/InputControl.java index 3cba3c82561..7e94ca2e96d 100644 --- a/src/main/java/forge/gui/input/InputControl.java +++ b/src/main/java/forge/control/input/InputControl.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import java.util.LinkedList; import java.util.Stack; @@ -66,7 +66,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ public final void setInput(final Input in) { if (this.model.getGameState().getStack().getResolving() @@ -84,7 +84,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. * @param bAddToResolving * a boolean. */ @@ -106,7 +106,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { *

* * @param in - * a {@link forge.gui.input.Input} object. + * a {@link forge.control.input.Input} object. */ private void changeInput(final Input in) { this.input = in; @@ -118,7 +118,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { * Getter for the field input. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public final Input getInput() { return this.input; @@ -165,7 +165,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { * updateInput. *

* - * @return a {@link forge.gui.input.Input} object. + * @return a {@link forge.control.input.Input} object. */ public final Input updateInput() { final String phase = this.model.getGameState().getPhaseHandler().getPhase(); diff --git a/src/main/java/forge/gui/input/InputMana.java b/src/main/java/forge/control/input/InputMana.java similarity index 88% rename from src/main/java/forge/gui/input/InputMana.java rename to src/main/java/forge/control/input/InputMana.java index 929b8a18d22..c3b660708b0 100644 --- a/src/main/java/forge/gui/input/InputMana.java +++ b/src/main/java/forge/control/input/InputMana.java @@ -1,4 +1,4 @@ -package forge.gui.input; +package forge.control.input; /** * TODO: Write javadoc for this type. diff --git a/src/main/java/forge/gui/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java similarity index 99% rename from src/main/java/forge/gui/input/InputMulligan.java rename to src/main/java/forge/control/input/InputMulligan.java index 1ffb31bc2af..a297c073030 100644 --- a/src/main/java/forge/gui/input/InputMulligan.java +++ b/src/main/java/forge/control/input/InputMulligan.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import java.util.ArrayList; diff --git a/src/main/java/forge/gui/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java similarity index 99% rename from src/main/java/forge/gui/input/InputPassPriority.java rename to src/main/java/forge/control/input/InputPassPriority.java index 086b8ab013d..841f2b9a1d8 100644 --- a/src/main/java/forge/gui/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.ButtonUtil; diff --git a/src/main/java/forge/gui/input/InputPayManaCost.java b/src/main/java/forge/control/input/InputPayManaCost.java similarity index 99% rename from src/main/java/forge/gui/input/InputPayManaCost.java rename to src/main/java/forge/control/input/InputPayManaCost.java index 9cb4efb4777..c1cbeb1a8d6 100644 --- a/src/main/java/forge/gui/input/InputPayManaCost.java +++ b/src/main/java/forge/control/input/InputPayManaCost.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.ButtonUtil; @@ -297,7 +297,7 @@ public class InputPayManaCost extends InputMana { } /* (non-Javadoc) - * @see forge.gui.input.InputMana#selectManaPool(String) + * @see forge.control.input.InputMana#selectManaPool(String) */ @Override public void selectManaPool(String color) { diff --git a/src/main/java/forge/gui/input/InputPayManaCostAbility.java b/src/main/java/forge/control/input/InputPayManaCostAbility.java similarity index 98% rename from src/main/java/forge/gui/input/InputPayManaCostAbility.java rename to src/main/java/forge/control/input/InputPayManaCostAbility.java index 6a46100a355..c287db46138 100644 --- a/src/main/java/forge/gui/input/InputPayManaCostAbility.java +++ b/src/main/java/forge/control/input/InputPayManaCostAbility.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import forge.AllZone; import forge.ButtonUtil; @@ -193,7 +193,7 @@ public class InputPayManaCostAbility extends InputMana { } /* (non-Javadoc) - * @see forge.gui.input.InputMana#selectManaPool() + * @see forge.control.input.InputMana#selectManaPool() */ @Override public void selectManaPool(String color) { diff --git a/src/main/java/forge/gui/input/InputPayManaCostUtil.java b/src/main/java/forge/control/input/InputPayManaCostUtil.java similarity index 99% rename from src/main/java/forge/gui/input/InputPayManaCostUtil.java rename to src/main/java/forge/control/input/InputPayManaCostUtil.java index d499627df24..608105a1bc7 100644 --- a/src/main/java/forge/gui/input/InputPayManaCostUtil.java +++ b/src/main/java/forge/control/input/InputPayManaCostUtil.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.gui.input; +package forge.control.input; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/forge/control/input/package-info.java b/src/main/java/forge/control/input/package-info.java new file mode 100644 index 00000000000..0411622c691 --- /dev/null +++ b/src/main/java/forge/control/input/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.control.input; + diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java index 0a3eca4762d..8f6be20059b 100644 --- a/src/main/java/forge/control/match/ControlField.java +++ b/src/main/java/forge/control/match/ControlField.java @@ -43,14 +43,14 @@ import forge.Player; import forge.PlayerZone; import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; +import forge.control.input.Input; +import forge.control.input.InputAttack; +import forge.control.input.InputBlock; +import forge.control.input.InputMana; +import forge.control.input.InputPayManaCost; +import forge.control.input.InputPayManaCostAbility; import forge.gui.ForgeAction; import forge.gui.GuiUtils; -import forge.gui.input.Input; -import forge.gui.input.InputAttack; -import forge.gui.input.InputBlock; -import forge.gui.input.InputMana; -import forge.gui.input.InputPayManaCost; -import forge.gui.input.InputPayManaCostAbility; import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.properties.NewConstants.Lang.GuiDisplay.ComputerHand; diff --git a/src/main/java/forge/gui/input/package-info.java b/src/main/java/forge/gui/input/package-info.java deleted file mode 100644 index 753795cab47..00000000000 --- a/src/main/java/forge/gui/input/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.gui.input; - diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index f4e27d9a709..209d9bf656c 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -33,8 +33,8 @@ import forge.ComputerAIInput; import forge.Constant; import forge.ConstantStringArrayList; import forge.Singletons; +import forge.control.input.InputControl; import forge.game.GameSummary; -import forge.gui.input.InputControl; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.properties.ForgeProps; diff --git a/src/test/java/forge/RunTest.java b/src/test/java/forge/RunTest.java index a1576413e20..dffc5014319 100644 --- a/src/test/java/forge/RunTest.java +++ b/src/test/java/forge/RunTest.java @@ -8,7 +8,7 @@ import org.testng.annotations.Test; import forge.card.cardfactory.CardFactoryInterface; import forge.card.mana.ManaCost; -import forge.gui.input.InputPayManaCostUtil; +import forge.control.input.InputPayManaCostUtil; /** *