From a50d23e35c22277c7a40da218ee18a1bdded86f0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 22 Jul 2013 13:14:02 +0200 Subject: [PATCH] Moved condition helper classes to mage.abilities.condition. --- Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java | 2 +- Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java | 2 +- Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java | 2 +- Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java | 2 +- Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java | 2 +- Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java | 2 +- Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java | 2 +- Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java | 2 +- Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java | 2 +- Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java | 2 +- Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java | 2 +- Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java | 2 +- .../mage/abilities/{condition => }/common/UnlessCondition.java | 2 +- .../mage/abilities/condition/{common => }/FixedCondition.java | 2 +- .../mage/abilities/decorator/ConditionalContinousEffect.java | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename Mage/src/mage/abilities/{condition => }/common/UnlessCondition.java (98%) rename Mage/src/mage/abilities/condition/{common => }/FixedCondition.java (95%) diff --git a/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java b/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java index fa70242084c..3800b21e387 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java +++ b/Mage.Sets/src/mage/sets/innistrad/ClifftopRetreat.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.RedManaAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java b/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java index d5edd169efe..91cab82d342 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java +++ b/Mage.Sets/src/mage/sets/innistrad/HinterlandHarbor.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java b/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java index 93bb155cb8e..01f054526e5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java +++ b/Mage.Sets/src/mage/sets/innistrad/IsolatedChapel.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java index 0f5354817d7..6e5bfa525ae 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; /** * diff --git a/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java b/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java index fd33939215c..3272d996084 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java +++ b/Mage.Sets/src/mage/sets/innistrad/SulfurFalls.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java b/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java index e43fcdb6e4a..43f5f47f6df 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java +++ b/Mage.Sets/src/mage/sets/innistrad/WoodlandCemetery.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java index 2dc36e338b7..fc6da5b6ee0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java index 6e41eee6b61..340f41f1ebf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java index 37d67634b71..4d56b4916c9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java +++ b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java index e2bfc5e33da..69d24104f2e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java +++ b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java index 6e00d8c4f3b..a39018a0d3d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java +++ b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java index 7b7d0f31ba1..623d99577c8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java +++ b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java @@ -34,7 +34,7 @@ import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.SacrificeTargetEffect; diff --git a/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java b/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java index 4c59dda8963..aea2dde3d84 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java index a66dd94e801..b0022dce0af 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BlackcleaveCliffs.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java index 0129248eab4..36ba1ee1d22 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperlineGorge.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java index 6aac4adee52..eb50871201a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickShores.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java index 5d1a70b7fd3..19c5039b4f4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RazorvergeThicket.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java index 33797c865a6..7f3b73c453f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeachromeCoast.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.ControlsPermanentCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java index e1fe23f64b7..56dbdc14318 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardControllerEffect; diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java index 0f145eb5623..1114d3a32ef 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireLacerator.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.TenOrLessLifeCondition; -import mage.abilities.condition.common.UnlessCondition; +import mage.abilities.common.UnlessCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LoseLifeSourceEffect; import mage.cards.CardImpl; diff --git a/Mage/src/mage/abilities/condition/common/UnlessCondition.java b/Mage/src/mage/abilities/common/UnlessCondition.java similarity index 98% rename from Mage/src/mage/abilities/condition/common/UnlessCondition.java rename to Mage/src/mage/abilities/common/UnlessCondition.java index f7e01af7aae..e11c15cdcf2 100644 --- a/Mage/src/mage/abilities/condition/common/UnlessCondition.java +++ b/Mage/src/mage/abilities/common/UnlessCondition.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.condition.common; +package mage.abilities.common; import mage.abilities.Ability; import mage.abilities.condition.Condition; diff --git a/Mage/src/mage/abilities/condition/common/FixedCondition.java b/Mage/src/mage/abilities/condition/FixedCondition.java similarity index 95% rename from Mage/src/mage/abilities/condition/common/FixedCondition.java rename to Mage/src/mage/abilities/condition/FixedCondition.java index d79ef273eb1..a2d3c0ae7d6 100644 --- a/Mage/src/mage/abilities/condition/common/FixedCondition.java +++ b/Mage/src/mage/abilities/condition/FixedCondition.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.condition.common; +package mage.abilities.condition; import mage.abilities.Ability; import mage.abilities.condition.Condition; diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java index b3379612178..c0ebdeabd6c 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java +++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java @@ -3,7 +3,7 @@ package mage.abilities.decorator; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.FixedCondition; +import mage.abilities.condition.FixedCondition; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration;