external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed "forge.gui.input" package to "forge.control.input" for consistency and clarity.

Browse Source
This commit is contained in:
Doublestrike
2012-02-16 10:55:11 +00:00
parent 89db347248
commit 4f2a4004e3
56 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.gitattributes vendored
View File

@@ -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

6
src/main/java/forge/AllZone.java
View File

@@ -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.
* </p>
*
* @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 &emsp; {@link forge.gui.input.InputControl} */
/** @param i0 &emsp; {@link forge.control.input.InputControl} */
public static void setInputControl(InputControl i0) {
AllZone.inputControl = i0;
}

2
src/main/java/forge/CardUtil.java
View File

@@ -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;

2
src/main/java/forge/CombatUtil.java
View File

@@ -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;
/**
* <p>

2
src/main/java/forge/ComputerAIInput.java
View File

@@ -19,7 +19,7 @@ package forge;
import com.esotericsoftware.minlog.Log;
import forge.gui.input.Input;
import forge.control.input.Input;
/**
* <p>

2
src/main/java/forge/ComputerUtil.java
View File

@@ -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;
/**
* <p>

8
src/main/java/forge/GameAction.java
View File

@@ -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;

4
src/main/java/forge/GameActionUtil.java
View File

@@ -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;
/**

4
src/main/java/forge/GuiInput.java
View File

@@ -20,7 +20,7 @@ package forge;
import java.util.Observable;
import java.util.Observer;
import forge.gui.input.Input;
import forge.control.input.Input;
/**
* <p>
@@ -61,7 +61,7 @@ public class GuiInput extends MyObservable implements Observer {
* </p>
*
* @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;

2
src/main/java/forge/HumanPlayer.java
View File

@@ -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;
/**
* <p>

4
src/main/java/forge/MagicStack.java
View File

@@ -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;
/**
* <p>

18
src/main/java/forge/PlayerUtil.java
View File

@@ -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;
/**
* <p>
@@ -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.
* </p>
*
* @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) {

2
src/main/java/forge/Untap.java
View File

@@ -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;
/**
* <p>

2
src/main/java/forge/Upkeep.java
View File

@@ -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;
/**
* <p>

2
src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
View File

@@ -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;
/**

2
src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java
View File

@@ -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;
/**

4
src/main/java/forge/card/cardfactory/AbstractCardFactory.java
View File

@@ -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;

2
src/main/java/forge/card/cardfactory/CardFactoryAuras.java
View File

@@ -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;
/**
* <p>

4
src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
View File

@@ -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;
/**

2
src/main/java/forge/card/cardfactory/CardFactoryLands.java
View File

@@ -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;
/**

6
src/main/java/forge/card/cardfactory/CardFactorySorceries.java
View File

@@ -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;
/**
* <p>

24
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -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() {

4
src/main/java/forge/card/cost/CostDiscard.java
View File

@@ -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) {

6
src/main/java/forge/card/cost/CostExile.java
View File

@@ -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() {

10
src/main/java/forge/card/cost/CostMana.java
View File

@@ -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) {

4
src/main/java/forge/card/cost/CostPutCounter.java
View File

@@ -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) {

6
src/main/java/forge/card/cost/CostReturn.java
View File

@@ -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() {

4
src/main/java/forge/card/cost/CostReveal.java
View File

@@ -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) {

6
src/main/java/forge/card/cost/CostSacrifice.java
View File

@@ -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() {

4
src/main/java/forge/card/cost/CostTapType.java
View File

@@ -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) {

4
src/main/java/forge/card/cost/CostUtil.java
View File

@@ -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 {
* </p>
*
* @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..

2
src/main/java/forge/card/mana/Mana.java
View File

@@ -19,7 +19,7 @@ package forge.card.mana;
import forge.Card;
import forge.Constant;
import forge.gui.input.InputPayManaCostUtil;
import forge.control.input.InputPayManaCostUtil;
/**
* <p>

2
src/main/java/forge/card/mana/ManaCost.java
View File

@@ -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;
/**
* <p>

2
src/main/java/forge/card/mana/ManaPartColor.java
View File

@@ -17,7 +17,7 @@
*/
package forge.card.mana;
import forge.gui.input.InputPayManaCostUtil;
import forge.control.input.InputPayManaCostUtil;
/**
* <p>

2
src/main/java/forge/card/mana/ManaPartSplit.java
View File

@@ -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)

2
src/main/java/forge/card/mana/ManaPool.java
View File

@@ -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;
/**
* <p>

14
src/main/java/forge/card/spellability/SpellAbility.java
View File

@@ -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 <code>beforePayMana</code>.
* </p>
*
* @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 {
* </p>
*
* @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 <code>afterPayMana</code>.
* </p>
*
* @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 {
* </p>
*
* @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 <code>afterResolve</code>.
* </p>
*
* @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 {
* </p>
*
* @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;

2
src/main/java/forge/card/spellability/SpellPermanent.java
View File

@@ -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;
/**
* <p>

4
src/main/java/forge/card/spellability/TargetSelection.java
View File

@@ -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;
/**
* <p>
@@ -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<Object> alreadyTargeted) {

2
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -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;
/**
* <p>

4
src/main/java/forge/gui/input/Input.java → src/main/java/forge/control/input/Input.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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 {
* </p>
*
* @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();

2
src/main/java/forge/gui/input/InputAttack.java → src/main/java/forge/control/input/InputAttack.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import forge.AllZone;
import forge.ButtonUtil;

2
src/main/java/forge/gui/input/InputBlock.java → src/main/java/forge/control/input/InputBlock.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import java.util.ArrayList;

2
src/main/java/forge/gui/input/InputCleanup.java → src/main/java/forge/control/input/InputCleanup.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import forge.AllZone;
import forge.ButtonUtil;

12
src/main/java/forge/gui/input/InputControl.java → src/main/java/forge/control/input/InputControl.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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 {
* </p>
*
* @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 {
* </p>
*
* @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 {
* </p>
*
* @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 <code>input</code>.
* </p>
*
* @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.
* </p>
*
* @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();

2
src/main/java/forge/gui/input/InputMana.java → src/main/java/forge/control/input/InputMana.java
View File

@@ -1,4 +1,4 @@
package forge.gui.input;
package forge.control.input;
/**
* TODO: Write javadoc for this type.

2
src/main/java/forge/gui/input/InputMulligan.java → src/main/java/forge/control/input/InputMulligan.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import java.util.ArrayList;

2
src/main/java/forge/gui/input/InputPassPriority.java → src/main/java/forge/control/input/InputPassPriority.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import forge.AllZone;
import forge.ButtonUtil;

4
src/main/java/forge/gui/input/InputPayManaCost.java → src/main/java/forge/control/input/InputPayManaCost.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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) {

4
src/main/java/forge/gui/input/InputPayManaCostAbility.java → src/main/java/forge/control/input/InputPayManaCostAbility.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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) {

2
src/main/java/forge/gui/input/InputPayManaCostUtil.java → src/main/java/forge/control/input/InputPayManaCostUtil.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.gui.input;
package forge.control.input;
import java.util.ArrayList;
import java.util.HashMap;

3
src/main/java/forge/control/input/package-info.java Normal file
View File

@@ -0,0 +1,3 @@
/** Forge Card Game. */
package forge.control.input;

12
src/main/java/forge/control/match/ControlField.java
View File

@@ -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;

3
src/main/java/forge/gui/input/package-info.java
View File

@@ -1,3 +0,0 @@
/** Forge Card Game. */
package forge.gui.input;

2
src/main/java/forge/model/FModel.java
View File

@@ -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;

2
src/test/java/forge/RunTest.java
View File

@@ -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;
/**
* <p>