diff --git a/.gitattributes b/.gitattributes index 53818d60741..9e8a1af9fab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10351,52 +10351,52 @@ src/main/java/forge/card/CardSet.java -text src/main/java/forge/card/CardSuperType.java -text src/main/java/forge/card/CardType.java -text src/main/java/forge/card/MtgDataParser.java -text -src/main/java/forge/card/abilityFactory/AbilityFactory.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java -text svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java -text svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java svneol=native#text/plain -src/main/java/forge/card/abilityFactory/package-info.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/AbstractCardFactory.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryAuras.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryCreatures.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryEquipment.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryInstants.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryInterface.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryLands.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactorySorceries.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/CardFactoryUtil.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/LazyCardFactory.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/PreloadingCardFactory.java svneol=native#text/plain -src/main/java/forge/card/cardFactory/package-info.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactory.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryChangeState.java -text svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCharm.java -text svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java svneol=native#text/plain +src/main/java/forge/card/abilityfactory/package-info.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/AbstractCardFactory.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryAuras.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryCreatures.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryEquipment.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryInstants.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryInterface.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryLands.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactorySorceries.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/CardFactoryUtil.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/LazyCardFactory.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/PreloadingCardFactory.java svneol=native#text/plain +src/main/java/forge/card/cardfactory/package-info.java svneol=native#text/plain src/main/java/forge/card/cost/Cost.java svneol=native#text/plain src/main/java/forge/card/cost/CostDiscard.java -text src/main/java/forge/card/cost/CostExile.java -text @@ -10447,11 +10447,11 @@ src/main/java/forge/card/spellability/Target.java svneol=native#text/plain src/main/java/forge/card/spellability/TargetChoices.java svneol=native#text/plain src/main/java/forge/card/spellability/TargetSelection.java svneol=native#text/plain src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbility.java svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java -text svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java -text svneol=native#text/plain -src/main/java/forge/card/staticAbility/package-info.java svneol=native#text/plain +src/main/java/forge/card/staticability/StaticAbility.java svneol=native#text/plain +src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java -text svneol=native#text/plain +src/main/java/forge/card/staticability/StaticAbilityContinuous.java svneol=native#text/plain +src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java -text svneol=native#text/plain +src/main/java/forge/card/staticability/package-info.java svneol=native#text/plain src/main/java/forge/card/trigger/Trigger.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerAlways.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerAttackerBlocked.java svneol=native#text/plain diff --git a/src/main/java/forge/AIPlayer.java b/src/main/java/forge/AIPlayer.java index 33f559249ea..405daaf51b5 100644 --- a/src/main/java/forge/AIPlayer.java +++ b/src/main/java/forge/AIPlayer.java @@ -3,7 +3,7 @@ package forge; import java.util.Random; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index 111575f4b5c..ccf27892278 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -5,8 +5,8 @@ import java.util.List; import net.slightlymagic.braids.util.UtilFunctions; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryInterface; -import forge.card.cardFactory.PreloadingCardFactory; +import forge.card.cardfactory.CardFactoryInterface; +import forge.card.cardfactory.PreloadingCardFactory; import forge.card.trigger.TriggerHandler; import forge.deck.DeckManager; import forge.game.GameSummary; @@ -276,7 +276,7 @@ public final class AllZone implements NewConstants { * getCardFactory. *

* - * @return a {@link forge.card.cardFactory.CardFactoryInterface} object. + * @return a {@link forge.card.cardfactory.CardFactoryInterface} object. * @since 1.0.15 */ public static CardFactoryInterface getCardFactory() { diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index f98baa1be67..26fde7668cd 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -14,14 +14,14 @@ import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; import forge.card.CardCharacteristics; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.spellability.AbilityMana; import forge.card.spellability.AbilityTriggered; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; import forge.item.CardDb; diff --git a/src/main/java/forge/CardList.java b/src/main/java/forge/CardList.java index 43eaa28e123..96c5134abb4 100644 --- a/src/main/java/forge/CardList.java +++ b/src/main/java/forge/CardList.java @@ -9,7 +9,7 @@ import java.util.List; import com.google.code.jyield.Generator; import com.google.code.jyield.Yieldable; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/CardListUtil.java b/src/main/java/forge/CardListUtil.java index cb74b978075..d52f6689fd4 100644 --- a/src/main/java/forge/CardListUtil.java +++ b/src/main/java/forge/CardListUtil.java @@ -5,7 +5,7 @@ import java.util.Comparator; import com.esotericsoftware.minlog.Log; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 78550b12df3..9cd19987ad1 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -8,8 +8,8 @@ import java.util.regex.Pattern; import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.trigger.Trigger; import forge.gui.GuiUtils; diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/ComputerAIGeneral.java index 8c5ec29bc6d..9888a4d93b5 100644 --- a/src/main/java/forge/ComputerAIGeneral.java +++ b/src/main/java/forge/ComputerAIGeneral.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java index efe48f3833f..d23fbb0ddfa 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/ComputerUtil.java @@ -8,8 +8,8 @@ import java.util.Comparator; import java.util.HashMap; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.cost.CostPayment; diff --git a/src/main/java/forge/ComputerUtilAttack.java b/src/main/java/forge/ComputerUtilAttack.java index dc007dd1287..fe27ed88cd5 100644 --- a/src/main/java/forge/ComputerUtilAttack.java +++ b/src/main/java/forge/ComputerUtilAttack.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Random; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.trigger.Trigger; //doesHumanAttackAndWin() uses the global variable AllZone.getComputerPlayer() diff --git a/src/main/java/forge/ComputerUtilBlock.java b/src/main/java/forge/ComputerUtilBlock.java index 7e75f61e859..c3c2a2883f0 100644 --- a/src/main/java/forge/ComputerUtilBlock.java +++ b/src/main/java/forge/ComputerUtilBlock.java @@ -2,7 +2,7 @@ package forge; import java.util.ArrayList; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 7f99ce5a1e0..10b2936eccc 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -11,11 +11,11 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.abilityFactory.AbilityFactoryAttach; -import forge.card.abilityFactory.AbilityFactoryCharm; -import forge.card.cardFactory.CardFactoryInterface; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactoryAttach; +import forge.card.abilityfactory.AbilityFactoryCharm; +import forge.card.cardfactory.CardFactoryInterface; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostPayment; import forge.card.mana.ManaCost; @@ -26,7 +26,7 @@ import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbilityRequirements; import forge.card.spellability.Target; import forge.card.spellability.TargetSelection; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; import forge.deck.Deck; import forge.game.GameEndReason; diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index c39107b570a..2cb7ae3da77 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -6,8 +6,8 @@ import java.util.HashMap; import javax.swing.JOptionPane; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; diff --git a/src/main/java/forge/GuiDisplay.java b/src/main/java/forge/GuiDisplay.java index 6e18b1c58e8..df9e8daca4b 100644 --- a/src/main/java/forge/GuiDisplay.java +++ b/src/main/java/forge/GuiDisplay.java @@ -79,7 +79,7 @@ import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStreamException; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.error.ErrorViewer; import forge.gui.ForgeAction; import forge.gui.GuiUtils; diff --git a/src/main/java/forge/GuiDisplayUtil.java b/src/main/java/forge/GuiDisplayUtil.java index 1ae7f83950b..3ef5cada832 100644 --- a/src/main/java/forge/GuiDisplayUtil.java +++ b/src/main/java/forge/GuiDisplayUtil.java @@ -26,7 +26,7 @@ import javax.swing.border.Border; import arcane.ui.PlayArea; import arcane.ui.util.Animation; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaPool; import forge.card.spellability.AbilityMana; import forge.gui.GuiUtils; diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 839247defee..861482814e0 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -8,8 +8,8 @@ import java.util.Stack; import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaCost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java index 6dced87b273..1bfa4db521d 100644 --- a/src/main/java/forge/PhaseUtil.java +++ b/src/main/java/forge/PhaseUtil.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.gui.input.Input; /** diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 8b3eb55bb72..5e37e12e644 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -12,11 +12,11 @@ import java.util.Random; import javax.swing.JOptionPane; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaPool; import forge.card.spellability.Ability; import forge.card.spellability.SpellAbility; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.game.GameLossReason; /** diff --git a/src/main/java/forge/PlayerZoneComesIntoPlay.java b/src/main/java/forge/PlayerZoneComesIntoPlay.java index 8c3d9c879c2..20628546af6 100644 --- a/src/main/java/forge/PlayerZoneComesIntoPlay.java +++ b/src/main/java/forge/PlayerZoneComesIntoPlay.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.spellability.SpellAbility; diff --git a/src/main/java/forge/StaticEffects.java b/src/main/java/forge/StaticEffects.java index 00625452826..f512518a80f 100644 --- a/src/main/java/forge/StaticEffects.java +++ b/src/main/java/forge/StaticEffects.java @@ -7,9 +7,9 @@ import java.util.HashMap; import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; /** *

diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index 0ef188a58c4..bb0cdd6bae4 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; import forge.card.spellability.AbilityStatic; diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java index b279511ff1b..b16c5519e66 100644 --- a/src/main/java/forge/card/CardCharacteristics.java +++ b/src/main/java/forge/card/CardCharacteristics.java @@ -9,7 +9,7 @@ import forge.CardColor; import forge.SetInfo; import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; /** diff --git a/src/main/java/forge/card/abilityFactory/package-info.java b/src/main/java/forge/card/abilityFactory/package-info.java deleted file mode 100644 index f728b2bd3fc..00000000000 --- a/src/main/java/forge/card/abilityFactory/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Forge Card Game. */ -package forge.card.abilityFactory; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java similarity index 99% rename from src/main/java/forge/card/abilityFactory/AbilityFactory.java rename to src/main/java/forge/card/abilityfactory/AbilityFactory.java index 4532cda4ed6..91e7949ef8a 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.GameActionUtil; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilitySub; @@ -2099,7 +2099,7 @@ public class AbilityFactory { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public static void handleRemembering(final AbilityFactory af) { final HashMap params = af.getMapParams(); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java index 166a6a13655..f4112d83fb6 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -42,7 +42,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityGainLife(final AbilityFactory abilityFactory) { @@ -85,7 +85,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellGainLife(final AbilityFactory abilityFactory) { @@ -127,7 +127,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackGainLife(final AbilityFactory abilityFactory) { @@ -178,7 +178,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -228,7 +228,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -318,7 +318,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -370,7 +370,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -404,7 +404,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityLoseLife(final AbilityFactory abilityFactory) { @@ -450,7 +450,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellLoseLife(final AbilityFactory abilityFactory) { @@ -491,7 +491,7 @@ public class AbilityFactoryAlterLife { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackLoseLife(final AbilityFactory abilityFactory) { @@ -541,7 +541,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -590,7 +590,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -675,7 +675,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -737,7 +737,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -775,7 +775,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityPoison(final AbilityFactory af) { @@ -815,7 +815,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellPoison(final AbilityFactory af) { @@ -852,7 +852,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackPoison(final AbilityFactory af) { @@ -899,7 +899,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -943,7 +943,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -973,7 +973,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1041,7 +1041,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1100,7 +1100,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilitySetLife(final AbilityFactory af) { @@ -1137,7 +1137,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellSetLife(final AbilityFactory af) { @@ -1174,7 +1174,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackSetLife(final AbilityFactory af) { @@ -1221,7 +1221,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1271,7 +1271,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1362,7 +1362,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1433,7 +1433,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1467,7 +1467,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityExchangeLife(final AbilityFactory af) { @@ -1504,7 +1504,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellExchangeLife(final AbilityFactory af) { @@ -1536,7 +1536,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackExchangeLife(final AbilityFactory af) { @@ -1578,7 +1578,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1626,7 +1626,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1677,7 +1677,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1697,7 +1697,7 @@ public class AbilityFactoryAlterLife { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java similarity index 97% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java index e71c0f4a525..380ab3915bf 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,7 @@ import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; @@ -48,7 +48,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityAnimate(final AbilityFactory af) { @@ -84,7 +84,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellAnimate(final AbilityFactory af) { @@ -115,7 +115,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackAnimate(final AbilityFactory af) { @@ -151,7 +151,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -281,7 +281,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -366,7 +366,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -391,7 +391,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -426,7 +426,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -446,7 +446,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -657,7 +657,7 @@ public final class AbilityFactoryAnimate { * @param c * a {@link forge.Card} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param power * a int. * @param toughness @@ -808,7 +808,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityAnimateAll(final AbilityFactory af) { @@ -844,7 +844,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellAnimateAll(final AbilityFactory af) { @@ -875,7 +875,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackAnimateAll(final AbilityFactory af) { @@ -911,7 +911,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -950,7 +950,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -972,7 +972,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -994,7 +994,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1022,7 +1022,7 @@ public final class AbilityFactoryAnimate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java similarity index 99% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java index 7620b07ef49..37808a40324 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -20,14 +20,14 @@ import forge.Constant.Zone; import forge.GameEntity; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.gui.GuiUtils; /** diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeState.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryChangeState.java index cb95e80bd4e..259570dab8a 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeState.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -10,7 +10,7 @@ import forge.Card; import forge.CardList; import forge.Constant.Zone; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java similarity index 97% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index 50d7ea2398e..43154ca4aa1 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -20,7 +20,7 @@ import forge.GameActionUtil; import forge.MyRandom; import forge.Player; import forge.PlayerZone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -55,7 +55,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityChangeZone(final AbilityFactory af) { @@ -93,7 +93,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellChangeZone(final AbilityFactory af) { @@ -125,7 +125,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackChangeZone(final AbilityFactory af) { @@ -191,7 +191,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -219,7 +219,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -243,7 +243,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -267,7 +267,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -293,7 +293,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -317,7 +317,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -349,7 +349,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -444,7 +444,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -470,7 +470,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -555,7 +555,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -660,7 +660,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -709,7 +709,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player @@ -878,7 +878,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player @@ -1137,7 +1137,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1243,7 +1243,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1262,7 +1262,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1460,7 +1460,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1546,7 +1546,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1582,7 +1582,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1705,7 +1705,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1843,7 +1843,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityChangeZoneAll(final AbilityFactory af) { @@ -1881,7 +1881,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellChangeZoneAll(final AbilityFactory af) { @@ -1913,7 +1913,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackChangeZoneAll(final AbilityFactory af) { @@ -1950,7 +1950,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2083,7 +2083,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2101,7 +2101,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -2140,7 +2140,7 @@ public final class AbilityFactoryChangeZone { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCharm.java similarity index 93% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCharm.java index f89bffd1914..574e430ba91 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCharm.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; @@ -30,7 +30,7 @@ public final class AbilityFactoryCharm { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityCharm(final AbilityFactory af) { @@ -67,7 +67,7 @@ public final class AbilityFactoryCharm { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellCharm(final AbilityFactory af) { diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java similarity index 95% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java index 4ec17aa887f..c7e808abfa1 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -18,7 +18,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; @@ -50,7 +50,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityChooseType(final AbilityFactory af) { @@ -88,7 +88,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellChooseType(final AbilityFactory af) { @@ -120,7 +120,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackChooseType(final AbilityFactory af) { @@ -157,7 +157,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -200,7 +200,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -215,7 +215,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -250,7 +250,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -404,7 +404,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -443,7 +443,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -476,7 +476,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -514,7 +514,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -561,7 +561,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -583,7 +583,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -600,7 +600,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -684,7 +684,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -723,7 +723,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -756,7 +756,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -794,7 +794,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -836,7 +836,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -851,7 +851,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -868,7 +868,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -931,7 +931,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -970,7 +970,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -1004,7 +1004,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -1043,7 +1043,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1085,7 +1085,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1100,7 +1100,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1117,7 +1117,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1164,7 +1164,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -1202,7 +1202,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -1235,7 +1235,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.1.6 */ @@ -1273,7 +1273,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1315,7 +1315,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1330,7 +1330,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1348,7 +1348,7 @@ public final class AbilityFactoryChoose { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java similarity index 95% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java index 0d6186e06a7..fbc0d9e5f75 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -32,7 +32,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -75,7 +75,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -118,7 +118,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -166,7 +166,7 @@ public final class AbilityFactoryClash { *

* * @param AF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param SA * a {@link forge.card.spellability.SpellAbility} object. */ @@ -213,7 +213,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -251,7 +251,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -294,7 +294,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -342,7 +342,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -377,7 +377,7 @@ public final class AbilityFactoryClash { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java similarity index 92% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java index 6f2d13261ba..18fb9963c3f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.HashMap; @@ -29,7 +29,7 @@ public final class AbilityFactoryCleanup { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.AbilitySub} object. */ public static AbilitySub getDrawback(final AbilityFactory af) { @@ -61,7 +61,7 @@ public final class AbilityFactoryCleanup { *

* * @param AF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java index 779b63822e8..5397e89c3f8 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -12,7 +12,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; @@ -43,7 +43,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityFog(final AbilityFactory af) { @@ -82,7 +82,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellFog(final AbilityFactory af) { @@ -116,7 +116,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackFog(final AbilityFactory af) { @@ -148,7 +148,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -179,7 +179,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -220,7 +220,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -248,7 +248,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -283,7 +283,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -306,7 +306,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * * @since 1.1.01 @@ -345,7 +345,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellMustAttack(final AbilityFactory af) { @@ -377,7 +377,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackMustAttack(final AbilityFactory af) { @@ -523,7 +523,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * * @since 1.1.6 @@ -562,7 +562,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellRemoveFromCombat(final AbilityFactory af) { @@ -594,7 +594,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRemoveFromCombat(final AbilityFactory af) { @@ -733,7 +733,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * * @since 1.1.6 @@ -772,7 +772,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * * @since 1.1.6 @@ -806,7 +806,7 @@ public final class AbilityFactoryCombat { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * * @since 1.1.6 diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java index 1fddbd9714e..57a8937fbe8 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -16,7 +16,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.MyRandom; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilitySub; @@ -49,7 +49,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityCopyPermanent(final AbilityFactory af) { @@ -87,7 +87,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellCopyPermanent(final AbilityFactory af) { @@ -119,7 +119,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackCopyPermanent(final AbilityFactory af) { @@ -156,7 +156,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -204,7 +204,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -237,7 +237,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -316,7 +316,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -486,7 +486,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityCopySpell(final AbilityFactory af) { @@ -524,7 +524,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellCopySpell(final AbilityFactory af) { @@ -556,7 +556,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackCopySpell(final AbilityFactory af) { @@ -593,7 +593,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -650,7 +650,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -665,7 +665,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -690,7 +690,7 @@ public final class AbilityFactoryCopy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java index 5e01cef0da0..a2146b00318 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import forge.AllZone; import forge.Card; import forge.ComputerUtil; import forge.MyRandom; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -53,7 +53,7 @@ public class AbilityFactoryCounterMagic { *

* * @param newAF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactoryCounterMagic(final AbilityFactory newAF) { this.af = newAF; @@ -73,7 +73,7 @@ public class AbilityFactoryCounterMagic { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public final SpellAbility getAbilityCounter(final AbilityFactory abilityFactory) { @@ -114,7 +114,7 @@ public class AbilityFactoryCounterMagic { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public final SpellAbility getSpellCounter(final AbilityFactory abilityFactory) { @@ -149,7 +149,7 @@ public class AbilityFactoryCounterMagic { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public final SpellAbility getDrawbackCounter(final AbilityFactory abilityFactory) { @@ -194,7 +194,7 @@ public class AbilityFactoryCounterMagic { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -283,7 +283,7 @@ public class AbilityFactoryCounterMagic { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -362,7 +362,7 @@ public class AbilityFactoryCounterMagic { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -418,7 +418,7 @@ public class AbilityFactoryCounterMagic { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 68de4b4d369..f38d8792a78 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -18,7 +18,7 @@ import forge.Counters; import forge.MyRandom; import forge.Player; import forge.PlayerZone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -50,7 +50,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityPutCounters(final AbilityFactory af) { @@ -88,7 +88,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellPutCounters(final AbilityFactory af) { @@ -125,7 +125,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackPutCounters(final AbilityFactory af) { @@ -162,7 +162,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -230,7 +230,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -386,7 +386,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -467,7 +467,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -638,7 +638,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -700,7 +700,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityRemoveCounters(final AbilityFactory af) { @@ -737,7 +737,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellRemoveCounters(final AbilityFactory af) { @@ -774,7 +774,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRemoveCounters(final AbilityFactory af) { @@ -811,7 +811,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -868,7 +868,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -942,7 +942,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -987,7 +987,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1024,7 +1024,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1074,7 +1074,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityProliferate(final AbilityFactory af) { @@ -1111,7 +1111,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellProliferate(final AbilityFactory af) { @@ -1149,7 +1149,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackProliferate(final AbilityFactory af) { @@ -1263,7 +1263,7 @@ public class AbilityFactoryCounters { *

* * @param AF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1452,7 +1452,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityPutCounterAll(final AbilityFactory af) { @@ -1490,7 +1490,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellPutCounterAll(final AbilityFactory af) { @@ -1522,7 +1522,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackPutCounterAll(final AbilityFactory af) { @@ -1559,7 +1559,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1597,7 +1597,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1706,7 +1706,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1721,7 +1721,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1761,7 +1761,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityRemoveCounterAll(final AbilityFactory af) { @@ -1799,7 +1799,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellRemoveCounterAll(final AbilityFactory af) { @@ -1831,7 +1831,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRemoveCounterAll(final AbilityFactory af) { @@ -1868,7 +1868,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1911,7 +1911,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1929,7 +1929,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1944,7 +1944,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1983,7 +1983,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityMoveCounters(final AbilityFactory af) { @@ -2020,7 +2020,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellMoveCounters(final AbilityFactory af) { @@ -2052,7 +2052,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackMoveCounters(final AbilityFactory af) { @@ -2089,7 +2089,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -2145,7 +2145,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2187,7 +2187,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2209,7 +2209,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -2253,7 +2253,7 @@ public class AbilityFactoryCounters { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java similarity index 98% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java index a2fe1a520b1..e2a0897cd67 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -15,7 +15,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -43,7 +43,7 @@ public class AbilityFactoryDealDamage { *

* * @param newAF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactoryDealDamage(final AbilityFactory newAF) { this.abilityFactory = newAF; @@ -172,7 +172,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -673,7 +673,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -922,7 +922,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -953,7 +953,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1042,7 +1042,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player @@ -1084,7 +1084,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1161,7 +1161,7 @@ public class AbilityFactoryDealDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java similarity index 95% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java index 35f2f2febe4..ff0173715fb 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -17,7 +17,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.MyRandom; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -51,7 +51,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDebuff(final AbilityFactory af) { @@ -88,7 +88,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDebuff(final AbilityFactory af) { @@ -120,7 +120,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDebuff(final AbilityFactory af) { @@ -174,7 +174,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -240,7 +240,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -304,7 +304,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -327,7 +327,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param kws @@ -391,7 +391,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param kws @@ -423,7 +423,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -499,7 +499,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -532,7 +532,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -589,7 +589,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -628,7 +628,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -661,7 +661,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -699,7 +699,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -753,7 +753,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -804,7 +804,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -825,7 +825,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -840,7 +840,7 @@ public final class AbilityFactoryDebuff { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java similarity index 93% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java index 3d14119bd88..7b10641afb5 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.HashMap; @@ -27,7 +27,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -64,7 +64,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -96,7 +96,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.AbilitySub} object. */ public static AbilitySub getDrawback(final AbilityFactory abilityFactory) { @@ -128,7 +128,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param spellAbility * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -152,7 +152,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param spellAbility * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -176,7 +176,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -196,7 +196,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -232,7 +232,7 @@ public class AbilityFactoryDelayedTrigger { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param spellAbility * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java index af973444e5e..cc23c997acd 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -15,7 +15,7 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -44,7 +44,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDestroy(final AbilityFactory af) { @@ -81,7 +81,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDestroy(final AbilityFactory af) { @@ -113,7 +113,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.AbilitySub} object. */ public static AbilitySub createDrawbackDestroy(final AbilityFactory af) { @@ -149,7 +149,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -270,7 +270,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -384,7 +384,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -466,7 +466,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -524,7 +524,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDestroyAll(final AbilityFactory af) { @@ -565,7 +565,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDestroyAll(final AbilityFactory af) { @@ -604,7 +604,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDestroyAll(final AbilityFactory af) { @@ -649,7 +649,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param noRegen @@ -698,7 +698,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param noRegen @@ -787,7 +787,7 @@ public class AbilityFactoryDestroy { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param noRegen diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java index 51937f20856..ae84c440b36 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.HashMap; import java.util.Random; @@ -35,7 +35,7 @@ public class AbilityFactoryEffect { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityEffect(final AbilityFactory abilityFactory) { @@ -77,7 +77,7 @@ public class AbilityFactoryEffect { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellEffect(final AbilityFactory abilityFactory) { @@ -113,7 +113,7 @@ public class AbilityFactoryEffect { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackEffect(final AbilityFactory abilityFactory) { @@ -159,7 +159,7 @@ public class AbilityFactoryEffect { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -189,7 +189,7 @@ public class AbilityFactoryEffect { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -230,7 +230,7 @@ public class AbilityFactoryEffect { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -261,7 +261,7 @@ public class AbilityFactoryEffect { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java similarity index 94% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java index 8ad4224468c..f9dabd7fd1e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; @@ -37,7 +37,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityWinsGame(final AbilityFactory af) { @@ -77,7 +77,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellWinsGame(final AbilityFactory af) { @@ -116,7 +116,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackWinsGame(final AbilityFactory af) { @@ -165,7 +165,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -196,7 +196,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -221,7 +221,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -250,7 +250,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -276,7 +276,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityLosesGame(final AbilityFactory af) { @@ -316,7 +316,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellLosesGame(final AbilityFactory af) { @@ -355,7 +355,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackLosesGame(final AbilityFactory af) { @@ -404,7 +404,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -447,7 +447,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -477,7 +477,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -520,7 +520,7 @@ public final class AbilityFactoryEndGameCondition { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java similarity index 99% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java index a1e9bf84fc7..28967bb710f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -15,7 +15,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilitySub; @@ -66,7 +66,7 @@ public class AbilityFactoryGainControl { *

* * @param newAF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactoryGainControl(final AbilityFactory newAF) { this.af = newAF; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java index 786b60204c5..5fb13565d0c 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -41,7 +41,7 @@ public class AbilityFactoryMana { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param produced * a {@link java.lang.String} object. * @return a {@link forge.card.spellability.SpellAbility} object. @@ -78,7 +78,7 @@ public class AbilityFactoryMana { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param produced * a {@link java.lang.String} object. * @return a {@link forge.card.spellability.SpellAbility} object. @@ -130,7 +130,7 @@ public class AbilityFactoryMana { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param produced * a {@link java.lang.String} object. * @return a {@link forge.card.spellability.AbilitySub} object. @@ -187,7 +187,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a boolean. */ public static boolean manaCanPlayAI(final AbilityFactory af) { @@ -203,7 +203,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -234,7 +234,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -284,7 +284,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -352,7 +352,7 @@ public class AbilityFactoryMana { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param produced * a {@link java.lang.String} object. * @return a {@link forge.card.spellability.SpellAbility} object. @@ -390,7 +390,7 @@ public class AbilityFactoryMana { *

* * @param abilityFactory - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param produced * a {@link java.lang.String} object. * @return a {@link forge.card.spellability.SpellAbility} object. @@ -440,7 +440,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a boolean. */ public static boolean manaReflectedCanPlayAI(final AbilityFactory af) { @@ -456,7 +456,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public static void manaReflectedResolve(final AbilityMana abMana, final AbilityFactory af) { // Spells are not undoable @@ -500,7 +500,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param colors * a {@link java.util.ArrayList} object. * @param parents @@ -681,7 +681,7 @@ public class AbilityFactoryMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param colors * a {@link java.util.ArrayList} object. * @param player @@ -746,7 +746,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param card @@ -788,7 +788,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -826,7 +826,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -859,7 +859,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -897,7 +897,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -945,7 +945,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -988,7 +988,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1030,7 +1030,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1068,7 +1068,7 @@ public class AbilityFactoryMana { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java similarity index 95% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java index 26118877d49..f17f948e38c 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -16,7 +16,7 @@ import forge.Constant.Zone; import forge.MyRandom; import forge.Phase; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -46,7 +46,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityUntap(final AbilityFactory af) { @@ -83,7 +83,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellUntap(final AbilityFactory af) { @@ -115,7 +115,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackUntap(final AbilityFactory af) { @@ -152,7 +152,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -207,7 +207,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -249,7 +249,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -295,7 +295,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -330,7 +330,7 @@ public class AbilityFactoryPermanentState { * @param tgt * a {@link forge.card.spellability.Target} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -407,7 +407,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -460,7 +460,7 @@ public class AbilityFactoryPermanentState { * @param tgt * a {@link forge.card.spellability.Target} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -529,7 +529,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -563,7 +563,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param params @@ -609,7 +609,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityTap(final AbilityFactory af) { @@ -646,7 +646,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellTap(final AbilityFactory af) { @@ -678,7 +678,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackTap(final AbilityFactory af) { @@ -715,7 +715,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -765,7 +765,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -825,7 +825,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -866,7 +866,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -906,7 +906,7 @@ public class AbilityFactoryPermanentState { * @param tgt * a {@link forge.card.spellability.Target} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -978,7 +978,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1026,7 +1026,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param tapList @@ -1098,7 +1098,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1130,7 +1130,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityUntapAll(final AbilityFactory af) { @@ -1167,7 +1167,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellUntapAll(final AbilityFactory af) { @@ -1199,7 +1199,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackUntapAll(final AbilityFactory af) { @@ -1236,7 +1236,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1251,7 +1251,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1294,7 +1294,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1312,7 +1312,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1337,7 +1337,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1371,7 +1371,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityTapAll(final AbilityFactory af) { @@ -1408,7 +1408,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellTapAll(final AbilityFactory af) { @@ -1440,7 +1440,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackTapAll(final AbilityFactory af) { @@ -1477,7 +1477,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1515,7 +1515,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1600,7 +1600,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1631,7 +1631,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1690,7 +1690,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1709,7 +1709,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityTapOrUntap(final AbilityFactory af) { @@ -1746,7 +1746,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellTapOrUntap(final AbilityFactory af) { @@ -1778,7 +1778,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackTapOrUntap(final AbilityFactory af) { @@ -1815,7 +1815,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1866,7 +1866,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1916,7 +1916,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1957,7 +1957,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1993,7 +1993,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -2044,7 +2044,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityPhases(final AbilityFactory af) { @@ -2081,7 +2081,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellPhases(final AbilityFactory af) { @@ -2113,7 +2113,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackPhases(final AbilityFactory af) { @@ -2150,7 +2150,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -2198,7 +2198,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2244,7 +2244,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -2278,7 +2278,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2313,7 +2313,7 @@ public class AbilityFactoryPermanentState { * @param tgt * a {@link forge.card.spellability.Target} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -2348,7 +2348,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -2372,7 +2372,7 @@ public class AbilityFactoryPermanentState { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java index 03d184228e4..cc15a9889d6 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -43,7 +43,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getAbilityPreventDamage(final AbilityFactory af) { @@ -82,7 +82,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getSpellPreventDamage(final AbilityFactory af) { @@ -116,7 +116,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackPreventDamage(final AbilityFactory af) { @@ -153,7 +153,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -222,7 +222,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -358,7 +358,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -395,7 +395,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -449,7 +449,7 @@ public class AbilityFactoryPreventDamage { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java index 54ec32dcb04..83f41351185 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -18,7 +18,7 @@ import forge.Command; import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -48,7 +48,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellProtection(final AbilityFactory af) { @@ -80,7 +80,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityProtection(final AbilityFactory af) { @@ -118,7 +118,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackProtection(final AbilityFactory af) { @@ -193,7 +193,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.CardList} object. */ private static CardList getProtectCreatures(final AbilityFactory af, final SpellAbility sa) { @@ -247,7 +247,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -319,7 +319,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -401,7 +401,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -511,7 +511,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -540,7 +540,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -565,7 +565,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -663,7 +663,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -813,7 +813,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellProtectionAll(final AbilityFactory af) { @@ -845,7 +845,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityProtectionAll(final AbilityFactory af) { @@ -883,7 +883,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackProtectionAll(final AbilityFactory af) { @@ -925,7 +925,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -965,7 +965,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -986,7 +986,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1001,7 +1001,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1053,7 +1053,7 @@ public final class AbilityFactoryProtection { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java similarity index 98% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java index 9993946b8ee..33e430a2b6a 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -17,7 +17,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -52,7 +52,7 @@ public class AbilityFactoryPump { *

* * @param newAF - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactoryPump(final AbilityFactory newAF) { this.abilityFactory = newAF; @@ -594,7 +594,7 @@ public class AbilityFactoryPump { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -676,7 +676,7 @@ public class AbilityFactoryPump { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -775,7 +775,7 @@ public class AbilityFactoryPump { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1228,7 +1228,7 @@ public class AbilityFactoryPump { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1265,7 +1265,7 @@ public class AbilityFactoryPump { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java similarity index 95% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java index f0fe053f694..207386f78e1 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import forge.Command; import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -47,7 +47,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getAbilityRegenerate(final AbilityFactory af) { @@ -86,7 +86,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getSpellRegenerate(final AbilityFactory af) { @@ -120,7 +120,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRegenerate(final AbilityFactory af) { @@ -157,7 +157,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -213,7 +213,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -326,7 +326,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -362,7 +362,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -434,7 +434,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -477,7 +477,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getAbilityRegenerateAll(final AbilityFactory af) { @@ -516,7 +516,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility getSpellRegenerateAll(final AbilityFactory af) { @@ -550,7 +550,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRegenerateAll(final AbilityFactory af) { @@ -587,7 +587,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -626,7 +626,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -700,7 +700,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -729,7 +729,7 @@ public class AbilityFactoryRegenerate { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java index 35ff3b5f66e..2d137743464 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.Arrays; @@ -53,7 +53,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDig(final AbilityFactory af) { @@ -91,7 +91,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDig(final AbilityFactory af) { @@ -123,7 +123,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDig(final AbilityFactory af) { @@ -160,7 +160,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -215,7 +215,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -274,7 +274,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -302,7 +302,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -587,7 +587,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDigUntil(final AbilityFactory af) { @@ -625,7 +625,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDigUntil(final AbilityFactory af) { @@ -657,7 +657,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDigUntil(final AbilityFactory af) { @@ -694,7 +694,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -777,7 +777,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -826,7 +826,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -854,7 +854,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -947,7 +947,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityRevealHand(final AbilityFactory af) { @@ -984,7 +984,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellRevealHand(final AbilityFactory af) { @@ -1016,7 +1016,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackRevealHand(final AbilityFactory af) { @@ -1055,7 +1055,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1104,7 +1104,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1160,7 +1160,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param primarySA @@ -1199,7 +1199,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1230,7 +1230,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1282,7 +1282,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityScry(final AbilityFactory af) { @@ -1319,7 +1319,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellScry(final AbilityFactory af) { @@ -1351,7 +1351,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackScry(final AbilityFactory af) { @@ -1390,7 +1390,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1424,7 +1424,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1448,7 +1448,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1467,7 +1467,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1516,7 +1516,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1556,7 +1556,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createRearrangeTopOfLibraryAbility(final AbilityFactory af) { @@ -1594,7 +1594,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createRearrangeTopOfLibrarySpell(final AbilityFactory af) { @@ -1632,7 +1632,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createRearrangeTopOfLibraryDrawback(final AbilityFactory af) { @@ -1671,7 +1671,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1729,7 +1729,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1770,7 +1770,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1866,7 +1866,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityReveal(final AbilityFactory af) { @@ -1903,7 +1903,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellReveal(final AbilityFactory af) { @@ -1935,7 +1935,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackReveal(final AbilityFactory af) { @@ -1975,7 +1975,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -2028,7 +2028,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -2085,7 +2085,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -2116,7 +2116,7 @@ public final class AbilityFactoryReveal { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java rename to src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java index 2fa4d9ebba2..54300c9ad32 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import forge.Constant.Zone; import forge.MyRandom; import forge.Player; import forge.PlayerUtil; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -42,7 +42,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilitySacrifice(final AbilityFactory af) { @@ -78,7 +78,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellSacrifice(final AbilityFactory af) { @@ -109,7 +109,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackSacrifice(final AbilityFactory af) { @@ -145,7 +145,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -214,7 +214,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -271,7 +271,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -296,7 +296,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -332,7 +332,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -396,7 +396,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -547,7 +547,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -584,7 +584,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -616,7 +616,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 */ @@ -653,7 +653,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -702,7 +702,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -778,7 +778,7 @@ public class AbilityFactorySacrifice { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @since 1.0.15 diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java similarity index 99% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java index 6c9c9165260..0b1f910194b 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.Arrays; import java.util.HashMap; @@ -12,7 +12,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -56,7 +56,7 @@ public class AbilityFactoryToken extends AbilityFactory { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactoryToken(final AbilityFactory af) { this.abilityFactory = af; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java similarity index 94% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java index e9b53ac4dd1..40841c088e3 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -31,7 +31,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityAddTurn(final AbilityFactory af) { @@ -69,7 +69,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellAddTurn(final AbilityFactory af) { @@ -101,7 +101,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackAddTurn(final AbilityFactory af) { @@ -138,7 +138,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -193,7 +193,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -208,7 +208,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -244,7 +244,7 @@ public class AbilityFactoryTurns { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java similarity index 96% rename from src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java rename to src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java index ace4681b5ce..da6f1b88963 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java @@ -1,4 +1,4 @@ -package forge.card.abilityFactory; +package forge.card.abilityfactory; import java.util.ArrayList; import java.util.HashMap; @@ -16,7 +16,7 @@ import forge.Constant.Zone; import forge.GameActionUtil; import forge.MyRandom; import forge.Player; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; import forge.card.spellability.AbilityActivated; @@ -45,7 +45,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDraw(final AbilityFactory af) { @@ -82,7 +82,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDraw(final AbilityFactory af) { @@ -114,7 +114,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDraw(final AbilityFactory af) { @@ -151,7 +151,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -224,7 +224,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -308,7 +308,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param primarySA @@ -433,7 +433,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -464,7 +464,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -541,7 +541,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityMill(final AbilityFactory af) { @@ -578,7 +578,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellMill(final AbilityFactory af) { @@ -610,7 +610,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackMill(final AbilityFactory af) { @@ -649,7 +649,7 @@ public class AbilityFactoryZoneAffecting { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link java.lang.String} object. */ private static String millStackDescription(final SpellAbility sa, final AbilityFactory af) { @@ -708,7 +708,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -791,7 +791,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -847,7 +847,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -900,7 +900,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -965,7 +965,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityDiscard(final AbilityFactory af) { @@ -1002,7 +1002,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellDiscard(final AbilityFactory af) { @@ -1034,7 +1034,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackDiscard(final AbilityFactory af) { @@ -1071,7 +1071,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ @@ -1231,7 +1231,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1321,7 +1321,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1432,7 +1432,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * TODO * @return a boolean. @@ -1457,7 +1457,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1489,7 +1489,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param subAb * a {@link forge.card.spellability.AbilitySub} object. * @return a boolean. @@ -1515,7 +1515,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createAbilityShuffle(final AbilityFactory af) { @@ -1552,7 +1552,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createSpellShuffle(final AbilityFactory af) { @@ -1584,7 +1584,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @return a {@link forge.card.spellability.SpellAbility} object. */ public static SpellAbility createDrawbackShuffle(final AbilityFactory af) { @@ -1621,7 +1621,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. @@ -1683,7 +1683,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @return a boolean. @@ -1714,7 +1714,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param primarySA @@ -1734,7 +1734,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param mandatory @@ -1765,7 +1765,7 @@ public class AbilityFactoryZoneAffecting { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ diff --git a/src/main/java/forge/card/abilityfactory/package-info.java b/src/main/java/forge/card/abilityfactory/package-info.java new file mode 100644 index 00000000000..c8f4c0c377d --- /dev/null +++ b/src/main/java/forge/card/abilityfactory/package-info.java @@ -0,0 +1,2 @@ +/** Forge Card Game. */ +package forge.card.abilityfactory; diff --git a/src/main/java/forge/card/cardFactory/package-info.java b/src/main/java/forge/card/cardFactory/package-info.java deleted file mode 100644 index 86f81f87cfc..00000000000 --- a/src/main/java/forge/card/cardFactory/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.cardFactory; - diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java similarity index 99% rename from src/main/java/forge/card/cardFactory/AbstractCardFactory.java rename to src/main/java/forge/card/cardfactory/AbstractCardFactory.java index 43bb051c7c3..d6cea386334 100644 --- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.io.File; import java.util.ArrayList; @@ -29,7 +29,7 @@ import forge.FileUtil; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryAuras.java b/src/main/java/forge/card/cardfactory/CardFactoryAuras.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryAuras.java rename to src/main/java/forge/card/cardfactory/CardFactoryAuras.java index 7604ec5064d..e325442c60d 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryAuras.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryAuras.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryCreatures.java rename to src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index 9d366cfaffe..72dbc7c5df1 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ import forge.GameActionUtil; import forge.MyRandom; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityActivated; @@ -164,7 +164,7 @@ public class CardFactoryCreatures { * @param cardName * a {@link java.lang.String} object. * @param cf - * a {@link forge.card.cardFactory.CardFactoryInterface} object. + * a {@link forge.card.cardfactory.CardFactoryInterface} object. * @return a {@link forge.Card} object. */ public static Card getCard(final Card card, final String cardName, final CardFactoryInterface cf) { diff --git a/src/main/java/forge/card/cardFactory/CardFactoryEquipment.java b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryEquipment.java rename to src/main/java/forge/card/cardfactory/CardFactoryEquipment.java index 1f9f62f3c30..d81dbbb2117 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryEquipment.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.ArrayList; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryInstants.java b/src/main/java/forge/card/cardfactory/CardFactoryInstants.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryInstants.java rename to src/main/java/forge/card/cardfactory/CardFactoryInstants.java index d898f3d146b..1f8e52bb309 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryInstants.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryInstants.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import javax.swing.JOptionPane; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryInterface.java b/src/main/java/forge/card/cardfactory/CardFactoryInterface.java similarity index 98% rename from src/main/java/forge/card/cardFactory/CardFactoryInterface.java rename to src/main/java/forge/card/cardfactory/CardFactoryInterface.java index 10b273b53dc..1bdf2f6dc61 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryInterface.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryInterface.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.Iterator; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryLands.java rename to src/main/java/forge/card/cardfactory/CardFactoryLands.java index cc6878a5811..2e530fd62dc 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import javax.swing.JOptionPane; @@ -44,7 +44,7 @@ class CardFactoryLands { * @param cardName * a {@link java.lang.String} object. * @param cf - * a {@link forge.card.cardFactory.CardFactoryInterface} object. + * a {@link forge.card.cardfactory.CardFactoryInterface} object. * @return a {@link forge.Card} object. */ public static Card getCard(final Card card, final String cardName, final CardFactoryInterface cf) { diff --git a/src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java b/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java rename to src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java index c1ee03ec3a2..323363e42f8 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryPlaneswalkers.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.HashMap; diff --git a/src/main/java/forge/card/cardFactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactorySorceries.java rename to src/main/java/forge/card/cardfactory/CardFactorySorceries.java index 678b8a2e737..54961f85f8c 100644 --- a/src/main/java/forge/card/cardFactory/CardFactorySorceries.java +++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactoryUtil.java rename to src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 3e0ca9a880a..23c522806e7 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +33,7 @@ import forge.MyRandom; import forge.Phase; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.spellability.Ability; diff --git a/src/main/java/forge/card/cardFactory/LazyCardFactory.java b/src/main/java/forge/card/cardfactory/LazyCardFactory.java similarity index 98% rename from src/main/java/forge/card/cardFactory/LazyCardFactory.java rename to src/main/java/forge/card/cardfactory/LazyCardFactory.java index 7246cfc730d..cac3befa9c1 100644 --- a/src/main/java/forge/card/cardFactory/LazyCardFactory.java +++ b/src/main/java/forge/card/cardfactory/LazyCardFactory.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java b/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java similarity index 98% rename from src/main/java/forge/card/cardFactory/PreloadingCardFactory.java rename to src/main/java/forge/card/cardfactory/PreloadingCardFactory.java index fd9b50459dc..0b69375e3f0 100644 --- a/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java +++ b/src/main/java/forge/card/cardfactory/PreloadingCardFactory.java @@ -1,4 +1,4 @@ -package forge.card.cardFactory; +package forge.card.cardfactory; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/forge/card/cardfactory/package-info.java b/src/main/java/forge/card/cardfactory/package-info.java new file mode 100644 index 00000000000..0d74d3d088e --- /dev/null +++ b/src/main/java/forge/card/cardfactory/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.card.cardfactory; + diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index 3c1de6392a8..f84df6c8051 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/src/main/java/forge/card/cost/CostDiscard.java @@ -10,7 +10,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index e05a109298a..3c6ab8e4cb4 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -14,7 +14,7 @@ import forge.Constant.Zone; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostGainLife.java b/src/main/java/forge/card/cost/CostGainLife.java index 9275fb12dca..0d4cbd0d38f 100644 --- a/src/main/java/forge/card/cost/CostGainLife.java +++ b/src/main/java/forge/card/cost/CostGainLife.java @@ -4,7 +4,7 @@ import forge.AllZone; import forge.Card; import forge.GameActionUtil; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 1f3ba3a7f88..e457f1172cc 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -10,7 +10,7 @@ import forge.Constant.Zone; import forge.Phase; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostMill.java b/src/main/java/forge/card/cost/CostMill.java index 9c0065b6d6c..0fabb3848a4 100644 --- a/src/main/java/forge/card/cost/CostMill.java +++ b/src/main/java/forge/card/cost/CostMill.java @@ -10,7 +10,7 @@ import forge.Constant.Zone; import forge.GameActionUtil; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/card/cost/CostPayLife.java b/src/main/java/forge/card/cost/CostPayLife.java index 2956b8c8d84..3fdf00d8701 100644 --- a/src/main/java/forge/card/cost/CostPayLife.java +++ b/src/main/java/forge/card/cost/CostPayLife.java @@ -4,7 +4,7 @@ import forge.AllZone; import forge.Card; import forge.GameActionUtil; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index d6693ffed27..a9d6a5fb3b2 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -8,8 +8,8 @@ import forge.Constant.Zone; import forge.Counters; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostRemoveCounter.java b/src/main/java/forge/card/cost/CostRemoveCounter.java index 1aad8280ee7..4f423519d80 100644 --- a/src/main/java/forge/card/cost/CostRemoveCounter.java +++ b/src/main/java/forge/card/cost/CostRemoveCounter.java @@ -3,7 +3,7 @@ package forge.card.cost; import forge.Card; import forge.Counters; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index 42c6875d4ff..2758d376b40 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/src/main/java/forge/card/cost/CostReturn.java @@ -11,7 +11,7 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index 33e0f6582af..fd12c5be1ba 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -9,7 +9,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index 3456786a8a0..f63f6cfdfb9 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -11,7 +11,7 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 9ac9dcb9909..594dc6b8789 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -10,7 +10,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/cost/CostUtil.java b/src/main/java/forge/card/cost/CostUtil.java index d5f0150f7cc..cc457698caf 100644 --- a/src/main/java/forge/card/cost/CostUtil.java +++ b/src/main/java/forge/card/cost/CostUtil.java @@ -8,7 +8,7 @@ import forge.CardList; import forge.ComputerUtil; import forge.Constant.Zone; import forge.Counters; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/spellability/AbilityActivated.java b/src/main/java/forge/card/spellability/AbilityActivated.java index 970d56285f5..69f1c918203 100644 --- a/src/main/java/forge/card/spellability/AbilityActivated.java +++ b/src/main/java/forge/card/spellability/AbilityActivated.java @@ -11,7 +11,7 @@ import forge.Constant.Zone; import forge.Player; import forge.card.cost.Cost; import forge.card.cost.CostPayment; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; /** *

diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java index b13462b842b..64f6e1c5163 100644 --- a/src/main/java/forge/card/spellability/Spell.java +++ b/src/main/java/forge/card/spellability/Spell.java @@ -12,7 +12,7 @@ import forge.Phase; import forge.Player; import forge.card.cost.Cost; import forge.card.cost.CostPayment; -import forge.card.staticAbility.StaticAbility; +import forge.card.staticability.StaticAbility; import forge.error.ErrorViewer; /** diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index 293bed71c95..6ee1fc81397 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -9,7 +9,7 @@ import forge.Command; import forge.CommandArgs; import forge.ComputerUtil; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.mana.Mana; import forge.gui.input.Input; @@ -752,7 +752,7 @@ public abstract class SpellAbility { *

* * @param af - * a {@link forge.card.abilityFactory.AbilityFactory} object. + * a {@link forge.card.abilityfactory.AbilityFactory} object. */ public void setAbilityFactory(final AbilityFactory af) { this.abilityFactory = af; @@ -763,7 +763,7 @@ public abstract class SpellAbility { * Getter for the field abilityFactory. *

* - * @return a {@link forge.card.abilityFactory.AbilityFactory} object. + * @return a {@link forge.card.abilityfactory.AbilityFactory} object. */ public AbilityFactory getAbilityFactory() { return this.abilityFactory; diff --git a/src/main/java/forge/card/spellability/SpellAbilityCondition.java b/src/main/java/forge/card/spellability/SpellAbilityCondition.java index d420dcfce43..da27972191b 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityCondition.java +++ b/src/main/java/forge/card/spellability/SpellAbilityCondition.java @@ -8,8 +8,8 @@ import forge.CardList; import forge.Constant.Zone; import forge.Phase; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbilityRequirements.java b/src/main/java/forge/card/spellability/SpellAbilityRequirements.java index ce75fc3f5f7..b4b13750286 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityRequirements.java +++ b/src/main/java/forge/card/spellability/SpellAbilityRequirements.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import forge.AllZone; import forge.Card; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.CostPayment; /** diff --git a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java index 6cf1a992521..a4eb7caea47 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java +++ b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java @@ -11,8 +11,8 @@ import forge.Constant.Zone; import forge.Phase; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/card/spellability/SpellPermanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java index 3aa7856f239..07c6be6160d 100644 --- a/src/main/java/forge/card/spellability/SpellPermanent.java +++ b/src/main/java/forge/card/spellability/SpellPermanent.java @@ -13,8 +13,8 @@ import forge.CommandReturn; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +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; diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java index 94aeb954a80..149c074e340 100644 --- a/src/main/java/forge/card/spellability/Target.java +++ b/src/main/java/forge/card/spellability/Target.java @@ -8,8 +8,8 @@ import forge.AllZoneUtil; import forge.Card; import forge.Constant; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; /** *

diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index f871a7ada95..a1f5d8228cf 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -13,7 +13,7 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; import forge.gui.GuiUtils; import forge.gui.input.Input; diff --git a/src/main/java/forge/card/staticAbility/package-info.java b/src/main/java/forge/card/staticAbility/package-info.java deleted file mode 100644 index 8433847de7c..00000000000 --- a/src/main/java/forge/card/staticAbility/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Forge Card Game. */ -package forge.card.staticAbility; diff --git a/src/main/java/forge/card/staticAbility/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java similarity index 99% rename from src/main/java/forge/card/staticAbility/StaticAbility.java rename to src/main/java/forge/card/staticability/StaticAbility.java index c6683b43c11..be18094295d 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility.java +++ b/src/main/java/forge/card/staticability/StaticAbility.java @@ -1,4 +1,4 @@ -package forge.card.staticAbility; +package forge.card.staticability; import java.util.HashMap; import java.util.Map; @@ -9,7 +9,7 @@ import forge.Card; import forge.Constant.Zone; import forge.GameEntity; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; /** * The Class StaticAbility. diff --git a/src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java b/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java similarity index 95% rename from src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java rename to src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java index 8732bff31fe..4fd7c04fc2b 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java +++ b/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java @@ -1,4 +1,4 @@ -package forge.card.staticAbility; +package forge.card.staticability; import java.util.HashMap; diff --git a/src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java similarity index 99% rename from src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java rename to src/main/java/forge/card/staticability/StaticAbilityContinuous.java index 40a768467db..25d7b6d8372 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java +++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java @@ -1,4 +1,4 @@ -package forge.card.staticAbility; +package forge.card.staticability; import java.util.ArrayList; import java.util.Arrays; @@ -12,8 +12,8 @@ import forge.CardUtil; import forge.Constant.Zone; import forge.Player; import forge.StaticEffect; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; diff --git a/src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java similarity index 93% rename from src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java rename to src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java index 4ee96f7901c..ad87e4646e8 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java +++ b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java @@ -1,10 +1,10 @@ -package forge.card.staticAbility; +package forge.card.staticability; import java.util.HashMap; import forge.Card; import forge.GameEntity; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.cardfactory.CardFactoryUtil; /** * The Class StaticAbility_PreventDamage. diff --git a/src/main/java/forge/card/staticability/package-info.java b/src/main/java/forge/card/staticability/package-info.java new file mode 100644 index 00000000000..dd8145a6287 --- /dev/null +++ b/src/main/java/forge/card/staticability/package-info.java @@ -0,0 +1,2 @@ +/** Forge Card Game. */ +package forge.card.staticability; diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 5508d4a7d26..16cbf5f466b 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -13,8 +13,8 @@ import forge.CardUtil; import forge.Constant.Zone; import forge.Player; import forge.PlayerZone; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.cardFactory.CardFactoryUtil; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; /** diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 4782a73a672..5c4c83e3124 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -15,8 +15,8 @@ import forge.Constant; import forge.Constant.Zone; import forge.GameActionUtil; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; -import forge.card.abilityFactory.AbilityFactoryCharm; +import forge.card.abilityfactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactoryCharm; import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.AbilityMana; diff --git a/src/main/java/forge/gui/input/InputMulligan.java b/src/main/java/forge/gui/input/InputMulligan.java index 57c8af357c6..efe09c84635 100644 --- a/src/main/java/forge/gui/input/InputMulligan.java +++ b/src/main/java/forge/gui/input/InputMulligan.java @@ -13,7 +13,7 @@ import forge.Constant.Zone; import forge.GameActionUtil; import forge.Phase; import forge.Player; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.spellability.SpellAbility; import forge.game.GamePlayerRating; import forge.quest.data.QuestData; diff --git a/src/main/java/forge/gui/input/InputPayManaCostUtil.java b/src/main/java/forge/gui/input/InputPayManaCostUtil.java index 6876c0ed42c..e32c8f1764d 100644 --- a/src/main/java/forge/gui/input/InputPayManaCostUtil.java +++ b/src/main/java/forge/gui/input/InputPayManaCostUtil.java @@ -9,7 +9,7 @@ import forge.AllZone; import forge.Card; import forge.Constant; import forge.Constant.Zone; -import forge.card.abilityFactory.AbilityFactoryMana; +import forge.card.abilityfactory.AbilityFactoryMana; import forge.card.mana.ManaCost; import forge.card.mana.ManaPool; import forge.card.spellability.AbilityMana; diff --git a/src/main/java/forge/quest/data/pet/QuestPetHound.java b/src/main/java/forge/quest/data/pet/QuestPetHound.java index 5f4ac06f1ef..b63d80c216e 100644 --- a/src/main/java/forge/quest/data/pet/QuestPetHound.java +++ b/src/main/java/forge/quest/data/pet/QuestPetHound.java @@ -2,7 +2,7 @@ package forge.quest.data.pet; import forge.AllZone; import forge.Card; -import forge.card.abilityFactory.AbilityFactory; +import forge.card.abilityfactory.AbilityFactory; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; diff --git a/src/test/java/forge/RunTest.java b/src/test/java/forge/RunTest.java index 2fa57ff7cd3..0ee3dea0bea 100644 --- a/src/test/java/forge/RunTest.java +++ b/src/test/java/forge/RunTest.java @@ -1,6 +1,6 @@ package forge; -import forge.card.cardFactory.CardFactoryInterface; +import forge.card.cardfactory.CardFactoryInterface; import forge.card.mana.ManaCost; import forge.gui.input.InputPayManaCostUtil; import org.testng.annotations.Test; diff --git a/src/test/java/forge/card/cardFactory/CardFactoryTest.java b/src/test/java/forge/card/cardFactory/CardFactoryTest.java index b125c88ddac..11b46e3150c 100644 --- a/src/test/java/forge/card/cardFactory/CardFactoryTest.java +++ b/src/test/java/forge/card/cardFactory/CardFactoryTest.java @@ -2,6 +2,9 @@ package forge.card.cardFactory; import forge.Card; import forge.CardList; +import forge.card.cardfactory.CardFactoryInterface; +import forge.card.cardfactory.LazyCardFactory; +import forge.card.cardfactory.PreloadingCardFactory; import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.view.swing.OldGuiNewGame; diff --git a/src/test/java/forge/card/cardFactory/CardFactoryUtilTest.java b/src/test/java/forge/card/cardFactory/CardFactoryUtilTest.java index e66f5f72e66..56c0de94811 100644 --- a/src/test/java/forge/card/cardFactory/CardFactoryUtilTest.java +++ b/src/test/java/forge/card/cardFactory/CardFactoryUtilTest.java @@ -1,8 +1,8 @@ package forge.card.cardFactory; -import static forge.card.cardFactory.CardFactoryUtil.getMostProminentCreatureType; -import static forge.card.cardFactory.CardFactoryUtil.isNegativeCounter; -import static forge.card.cardFactory.CardFactoryUtil.multiplyManaCost; +import static forge.card.cardfactory.CardFactoryUtil.getMostProminentCreatureType; +import static forge.card.cardfactory.CardFactoryUtil.isNegativeCounter; +import static forge.card.cardfactory.CardFactoryUtil.multiplyManaCost; import org.testng.annotations.Test;