From 82a45cee889b2e4687a1d33ee9350bb5ad11b6cf Mon Sep 17 00:00:00 2001 From: North Date: Mon, 2 Jun 2014 15:49:14 +0300 Subject: [PATCH] [refactor] removed generic parameter from Target --- Mage.Sets/src/mage/sets/avacynrestored/Outwit.java | 2 +- .../betrayersofkamigawa/StreamOfConsciousness.java | 2 +- .../mage/sets/championsofkamigawa/Reciprocate.java | 2 +- .../src/mage/sets/championsofkamigawa/Squelch.java | 2 +- .../src/mage/sets/conflux/GiltspireAvenger.java | 2 +- .../sets/darkascension/HuntmasterOfTheFells.java | 2 +- .../src/mage/sets/dissension/LoamingShaman.java | 2 +- .../src/mage/sets/gatecrash/BaneAlleyBroker.java | 2 +- .../src/mage/sets/gatecrash/ExecutionersSwing.java | 2 +- .../src/mage/sets/innistrad/MemorysJourney.java | 2 +- .../src/mage/sets/journeyintonyx/DaringThief.java | 2 +- .../src/mage/sets/magic2010/MirrorOfFate.java | 2 +- .../src/mage/sets/magic2014/ChandraPyromaster.java | 2 +- .../src/mage/sets/magic2014/StrionicResonator.java | 2 +- Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java | 2 +- .../portalthreekingdoms/DiaochanArtfulBeauty.java | 2 +- .../mage/sets/returntoravnica/AvengingArrow.java | 2 +- .../mage/sets/riseoftheeldrazi/NotOfThisWorld.java | 2 +- .../src/mage/sets/scarsofmirrodin/TurnAside.java | 2 +- .../src/mage/sets/timeshifted/GaeasBlessing.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java | 2 +- .../src/mage/sets/worldwake/SearingBlaze.java | 2 +- Mage/src/mage/target/TargetAmount.java | 14 ++++++++------ Mage/src/mage/target/TargetCard.java | 3 +-- Mage/src/mage/target/TargetImpl.java | 13 ++++++------- Mage/src/mage/target/TargetObject.java | 3 +-- Mage/src/mage/target/TargetPermanent.java | 5 ++--- Mage/src/mage/target/TargetPlayer.java | 2 +- Mage/src/mage/target/TargetSource.java | 2 +- Mage/src/mage/target/TargetSpell.java | 2 +- Mage/src/mage/target/TargetStackObject.java | 2 +- .../common/TargetActivatedOrTriggeredAbility.java | 2 +- .../target/common/TargetArtifactPermanent.java | 3 +-- .../target/common/TargetAttackingCreature.java | 2 +- .../common/TargetAttackingOrBlockingCreature.java | 2 +- .../mage/target/common/TargetBasicLandCard.java | 2 +- .../common/TargetCardInASingleGraveyard.java | 2 +- Mage/src/mage/target/common/TargetCardInExile.java | 2 +- .../mage/target/common/TargetCardInGraveyard.java | 2 +- Mage/src/mage/target/common/TargetCardInHand.java | 2 +- .../mage/target/common/TargetCardInLibrary.java | 2 +- .../common/TargetCardInOpponentsGraveyard.java | 2 +- .../target/common/TargetCardInYourGraveyard.java | 2 +- .../target/common/TargetControlledPermanent.java | 2 +- .../common/TargetCreatureOrPlaneswalker.java | 2 +- .../mage/target/common/TargetCreatureOrPlayer.java | 2 +- .../common/TargetCreatureOrPlayerAmount.java | 2 +- .../target/common/TargetCreaturePermanent.java | 2 +- .../common/TargetCreaturePermanentAmount.java | 2 +- Mage/src/mage/target/common/TargetDefender.java | 2 +- Mage/src/mage/target/common/TargetDiscard.java | 2 +- .../target/common/TargetEnchantmentPermanent.java | 2 +- .../mage/target/common/TargetLandPermanent.java | 2 +- .../mage/target/common/TargetNonlandPermanent.java | 2 +- Mage/src/mage/target/common/TargetOpponent.java | 2 +- .../target/common/TargetPermanentOrPlayer.java | 2 +- .../mage/target/common/TargetSpellOrPermanent.java | 2 +- 57 files changed, 70 insertions(+), 73 deletions(-) diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java b/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java index 293fb13cebb..6b99ca124db 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Outwit.java @@ -76,7 +76,7 @@ public class Outwit extends CardImpl { return new Outwit(this); } - private class CustomTargetSpell extends TargetObject { + private class CustomTargetSpell extends TargetObject { protected FilterSpell filter; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java index 6a45cd830f4..fdaa5d6a10e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java @@ -113,7 +113,7 @@ class StreamOfConsciousnessEffect extends OneShotEffect { } } -class StreamOfConsciousnessTarget extends TargetCard { +class StreamOfConsciousnessTarget extends TargetCard { public StreamOfConsciousnessTarget() { super(0, 4, Zone.GRAVEYARD, new FilterCard("cards from target player's graveyard")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java index f7f9710c43c..3e8a2b0fd61 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Reciprocate.java @@ -68,7 +68,7 @@ public class Reciprocate extends CardImpl { } -class ReciprocateTarget extends TargetPermanent { +class ReciprocateTarget extends TargetPermanent { public ReciprocateTarget() { super(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java index ca0221739d7..a3c2958ee9f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Squelch.java @@ -75,7 +75,7 @@ public class Squelch extends CardImpl { } } -class ActivatedAbilityTarget extends TargetObject { +class ActivatedAbilityTarget extends TargetObject { public ActivatedAbilityTarget() { this.minNumberOfTargets = 1; diff --git a/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java b/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java index 2a1896a5450..6d519d23d64 100644 --- a/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java +++ b/Mage.Sets/src/mage/sets/conflux/GiltspireAvenger.java @@ -87,7 +87,7 @@ public class GiltspireAvenger extends CardImpl { } } -class GiltspireAvengerTarget extends TargetPermanent { +class GiltspireAvengerTarget extends TargetPermanent { public GiltspireAvengerTarget() { super(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java index 4b9f06238b8..649952f0d72 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java @@ -206,7 +206,7 @@ class RavagerOfTheFellsEffect extends OneShotEffect { } -class RavagerOfTheFellsTarget extends TargetPermanent { +class RavagerOfTheFellsTarget extends TargetPermanent { public RavagerOfTheFellsTarget() { super(0, 1, new FilterCreaturePermanent(), false); diff --git a/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java b/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java index 8f1d1e4a25a..9ac991f5e1c 100644 --- a/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java +++ b/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java @@ -110,7 +110,7 @@ class LoamingShamanEffect extends OneShotEffect { } } -class LoamingShamanTargetCardsInGraveyard extends TargetCard { +class LoamingShamanTargetCardsInGraveyard extends TargetCard { public LoamingShamanTargetCardsInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); diff --git a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java index a90efeb1cc5..299bef4f99c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BaneAlleyBroker.java @@ -165,7 +165,7 @@ class BaneAlleyBrokerDrawExileEffect extends OneShotEffect { } } -class TargetCardInBaneAlleyBrokerExile extends TargetCard { +class TargetCardInBaneAlleyBrokerExile extends TargetCard { public TargetCardInBaneAlleyBrokerExile(UUID CardId) { super(1, 1, Zone.EXILED, new FilterCard("card exiled with Bane Alley Broker")); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java index 713bfbaf9aa..5e972510bc9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ExecutionersSwing.java @@ -73,7 +73,7 @@ public class ExecutionersSwing extends CardImpl { } } -class TargetCreaturePermanentThatDealtDamageThisTurn extends TargetPermanent { +class TargetCreaturePermanentThatDealtDamageThisTurn extends TargetPermanent { public TargetCreaturePermanentThatDealtDamageThisTurn() { super(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java index e2298334f25..99a22e4651c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java +++ b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java @@ -117,7 +117,7 @@ class MemorysJourneyEffect extends OneShotEffect { } } -class MemorysJourneyTarget extends TargetCard { +class MemorysJourneyTarget extends TargetCard { public MemorysJourneyTarget() { super(0, 3, Zone.GRAVEYARD, new FilterCard()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java index 9379ef4c6ba..4c0e5ada7fe 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java @@ -151,7 +151,7 @@ class TargetControlledPermanentSharingOpponentPermanentCardType extends TargetCo } -class DaringThiefSecondTarget extends TargetPermanent { +class DaringThiefSecondTarget extends TargetPermanent { private Permanent firstTarget = null; diff --git a/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java b/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java index 67b5fa49c49..b4d49b7cc48 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java +++ b/Mage.Sets/src/mage/sets/magic2010/MirrorOfFate.java @@ -146,7 +146,7 @@ class FaceUpPredicate implements Predicate { } } -class MirrorOfFateTarget extends TargetCard { +class MirrorOfFateTarget extends TargetCard { public MirrorOfFateTarget() { super(0, 7, Zone.EXILED, new FilterCard()); diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java index 02433f01280..2bb3ad8fe52 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java @@ -139,7 +139,7 @@ class ChandraPyromasterEffect1 extends OneShotEffect { } } -class ChandraPyromasterTarget extends TargetPermanent { +class ChandraPyromasterTarget extends TargetPermanent { public ChandraPyromasterTarget() { super(0, 1, new FilterCreaturePermanent("creature that the targeted player controls"), false); diff --git a/Mage.Sets/src/mage/sets/magic2014/StrionicResonator.java b/Mage.Sets/src/mage/sets/magic2014/StrionicResonator.java index 78ca52a26e2..39fb9b6c440 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StrionicResonator.java +++ b/Mage.Sets/src/mage/sets/magic2014/StrionicResonator.java @@ -130,7 +130,7 @@ class StrionicResonatorEffect extends OneShotEffect { } } -class TargetTriggeredAbility extends TargetObject { +class TargetTriggeredAbility extends TargetObject { public TargetTriggeredAbility() { this.minNumberOfTargets = 1; diff --git a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java index eb1a04508ac..a2afbd7f7b1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java +++ b/Mage.Sets/src/mage/sets/odyssey/AEtherBurst.java @@ -94,7 +94,7 @@ public class AEtherBurst extends CardImpl { } } -class DynamicTargetCreaturePermanent extends TargetPermanent { +class DynamicTargetCreaturePermanent extends TargetPermanent { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creatures"); diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java index 5ebc4ab71dc..830cfa07375 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java @@ -116,7 +116,7 @@ class DiaochanArtfulBeautyDestroyEffect extends OneShotEffect { } } -class TargetOpponentsChoiceCreaturePermanent extends TargetPermanent { +class TargetOpponentsChoiceCreaturePermanent extends TargetPermanent { private UUID opponentId = null; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java index e90a93c94f8..e8e8c2bbaeb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AvengingArrow.java @@ -69,7 +69,7 @@ public class AvengingArrow extends CardImpl { } } -class AvengingArrowTarget extends TargetPermanent { +class AvengingArrowTarget extends TargetPermanent { public AvengingArrowTarget() { super(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java index 9bcc09cd89f..4c859c2d5c0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java @@ -87,7 +87,7 @@ public class NotOfThisWorld extends CardImpl { } } -class TargetSpellTargetingControlledPermanent extends TargetObject { +class TargetSpellTargetingControlledPermanent extends TargetObject { public TargetSpellTargetingControlledPermanent() { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java index 977e1eb04f2..1eea36e0b7c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnAside.java @@ -73,7 +73,7 @@ public class TurnAside extends CardImpl { return new TurnAside(this); } - private class CustomTargetSpell extends TargetObject { + private class CustomTargetSpell extends TargetObject { protected FilterSpell filter; diff --git a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java index ce1ca2c35ca..6ec9dfaf7f6 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java @@ -120,7 +120,7 @@ class GaeasBlessingEffect extends OneShotEffect { } } -class GaeasBlessingTarget extends TargetCard { +class GaeasBlessingTarget extends TargetCard { public GaeasBlessingTarget() { super(0, 3, Zone.GRAVEYARD, new FilterCard()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java index 9003f3a4918..186781238e1 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Intervene.java @@ -72,7 +72,7 @@ public class Intervene extends CardImpl { return new Intervene(this); } - private class InterveneTargetSpell extends TargetObject { + private class InterveneTargetSpell extends TargetObject { public InterveneTargetSpell() { diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index bffb317e6c2..f428a12cb78 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -121,7 +121,7 @@ class SearingBlazeEffect extends OneShotEffect { } -class SearingBlazeTarget extends TargetPermanent { +class SearingBlazeTarget extends TargetPermanent { public SearingBlazeTarget() { super(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage/src/mage/target/TargetAmount.java b/Mage/src/mage/target/TargetAmount.java index 9c83080c5f7..9b9ceea8b76 100644 --- a/Mage/src/mage/target/TargetAmount.java +++ b/Mage/src/mage/target/TargetAmount.java @@ -39,9 +39,8 @@ import mage.players.Player; /** * * @author BetaSteward_at_googlemail.com - * @param */ -public abstract class TargetAmount> extends TargetImpl { +public abstract class TargetAmount extends TargetImpl { boolean amountWasSet = false; DynamicValue amount; @@ -65,6 +64,9 @@ public abstract class TargetAmount> extends TargetImpl this.amountWasSet = target.amountWasSet; } + @Override + public abstract TargetAmount copy(); + public int getAmountRemaining() { return remainingAmount; } @@ -127,8 +129,8 @@ public abstract class TargetAmount> extends TargetImpl } @Override - public List getTargetOptions(Ability source, Game game) { - List options = new ArrayList<>(); + public List getTargetOptions(Ability source, Game game) { + List options = new ArrayList<>(); Set possibleTargets = possibleTargets(source.getSourceId(), source.getControllerId(), game); addTargets(this, possibleTargets, options, source, game); @@ -136,13 +138,13 @@ public abstract class TargetAmount> extends TargetImpl return options; } - protected void addTargets(TargetAmount target, Set targets, List options, Ability source, Game game) { + protected void addTargets(TargetAmount target, Set targets, List options, Ability source, Game game) { if (!amountWasSet) { setAmount(source, game); } for (UUID targetId: targets) { for (int n = 1; n <= target.remainingAmount; n++) { - T t = target.copy(); + TargetAmount t = target.copy(); t.addTarget(targetId, n, source, game, true); if (t.remainingAmount > 0) { if (targets.size() > 1) { diff --git a/Mage/src/mage/target/TargetCard.java b/Mage/src/mage/target/TargetCard.java index a3f0f13c7b9..cb1c9da64c5 100644 --- a/Mage/src/mage/target/TargetCard.java +++ b/Mage/src/mage/target/TargetCard.java @@ -42,9 +42,8 @@ import java.util.UUID; /** * * @author BetaSteward_at_googlemail.com - * @param */ -public class TargetCard> extends TargetObject> { +public class TargetCard extends TargetObject { protected FilterCard filter; diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index 5829e4ff49b..2854665787a 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -42,9 +42,8 @@ import java.util.*; /** * * @author BetaSteward_at_googlemail.com - * @param */ -public abstract class TargetImpl> implements Target { +public abstract class TargetImpl implements Target { protected Map targets = new LinkedHashMap<>(); protected Map zoneChangeCounters = new HashMap<>(); @@ -60,7 +59,7 @@ public abstract class TargetImpl> implements Target { protected boolean atRandom = false; @Override - public abstract T copy(); + public abstract TargetImpl copy(); public TargetImpl() { this(false); @@ -70,7 +69,7 @@ public abstract class TargetImpl> implements Target { this.notTarget = notTarget; } - public TargetImpl(final TargetImpl target) { + public TargetImpl(final TargetImpl target) { this.targetName = target.targetName; this.zone = target.zone; this.maxNumberOfTargets = target.maxNumberOfTargets; @@ -340,14 +339,14 @@ public abstract class TargetImpl> implements Target { } @Override - public List getTargetOptions(Ability source, Game game) { - List options = new ArrayList(); + public List getTargetOptions(Ability source, Game game) { + List options = new ArrayList<>(); Set possibleTargets = possibleTargets(source.getSourceId(), source.getControllerId(), game); possibleTargets.removeAll(getTargets()); Iterator it = possibleTargets.iterator(); while (it.hasNext()) { UUID targetId = it.next(); - T target = this.copy(); + TargetImpl target = this.copy(); target.clearChosen(); target.addTarget(targetId, source, game, true); if (!target.isChosen()) { diff --git a/Mage/src/mage/target/TargetObject.java b/Mage/src/mage/target/TargetObject.java index 14d4c63c1d6..c3b14b7b538 100644 --- a/Mage/src/mage/target/TargetObject.java +++ b/Mage/src/mage/target/TargetObject.java @@ -38,9 +38,8 @@ import java.util.UUID; /** * * @author BetaSteward_at_googlemail.com - * @param */ -public abstract class TargetObject> extends TargetImpl { +public abstract class TargetObject extends TargetImpl { protected TargetObject() {} diff --git a/Mage/src/mage/target/TargetPermanent.java b/Mage/src/mage/target/TargetPermanent.java index 4d3ec6d43b3..164dd659b93 100644 --- a/Mage/src/mage/target/TargetPermanent.java +++ b/Mage/src/mage/target/TargetPermanent.java @@ -42,9 +42,8 @@ import mage.game.permanent.Permanent; /** * * @author BetaSteward_at_googlemail.com - * @param */ -public class TargetPermanent> extends TargetObject> { +public class TargetPermanent extends TargetObject { protected FilterPermanent filter; @@ -79,7 +78,7 @@ public class TargetPermanent> extends TargetObject< this.notTarget = notTarget; } - public TargetPermanent(final TargetPermanent target) { + public TargetPermanent(final TargetPermanent target) { super(target); this.filter = target.filter.copy(); } diff --git a/Mage/src/mage/target/TargetPlayer.java b/Mage/src/mage/target/TargetPlayer.java index 5e9a82d7584..27855f0bc16 100644 --- a/Mage/src/mage/target/TargetPlayer.java +++ b/Mage/src/mage/target/TargetPlayer.java @@ -42,7 +42,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class TargetPlayer> extends TargetImpl> { +public class TargetPlayer extends TargetImpl { protected FilterPlayer filter; diff --git a/Mage/src/mage/target/TargetSource.java b/Mage/src/mage/target/TargetSource.java index fa3f8046020..d33b526edeb 100644 --- a/Mage/src/mage/target/TargetSource.java +++ b/Mage/src/mage/target/TargetSource.java @@ -46,7 +46,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class TargetSource extends TargetObject { +public class TargetSource extends TargetObject { protected FilterObject filter; diff --git a/Mage/src/mage/target/TargetSpell.java b/Mage/src/mage/target/TargetSpell.java index 5242739da78..7e87627f9fe 100644 --- a/Mage/src/mage/target/TargetSpell.java +++ b/Mage/src/mage/target/TargetSpell.java @@ -42,7 +42,7 @@ import mage.game.stack.StackObject; * * @author BetaSteward_at_googlemail.com */ -public class TargetSpell extends TargetObject { +public class TargetSpell extends TargetObject { protected FilterSpell filter; diff --git a/Mage/src/mage/target/TargetStackObject.java b/Mage/src/mage/target/TargetStackObject.java index 3ed4045c448..064b4807e5f 100644 --- a/Mage/src/mage/target/TargetStackObject.java +++ b/Mage/src/mage/target/TargetStackObject.java @@ -42,7 +42,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class TargetStackObject extends TargetObject { +public class TargetStackObject extends TargetObject { protected FilterStackObject filter; diff --git a/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java b/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java index 80af554fbd2..d64fc9b4615 100644 --- a/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java +++ b/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java @@ -47,7 +47,7 @@ import mage.target.TargetObject; */ -public class TargetActivatedOrTriggeredAbility extends TargetObject { +public class TargetActivatedOrTriggeredAbility extends TargetObject { public TargetActivatedOrTriggeredAbility() { this.minNumberOfTargets = 1; diff --git a/Mage/src/mage/target/common/TargetArtifactPermanent.java b/Mage/src/mage/target/common/TargetArtifactPermanent.java index a9e0aba1ecd..6be7fb5b577 100644 --- a/Mage/src/mage/target/common/TargetArtifactPermanent.java +++ b/Mage/src/mage/target/common/TargetArtifactPermanent.java @@ -33,9 +33,8 @@ import mage.target.TargetPermanent; /** * @author ayratn - * @param */ -public class TargetArtifactPermanent> extends TargetPermanent> { +public class TargetArtifactPermanent extends TargetPermanent { public TargetArtifactPermanent(boolean required) { this(); diff --git a/Mage/src/mage/target/common/TargetAttackingCreature.java b/Mage/src/mage/target/common/TargetAttackingCreature.java index d3fc045d2a5..b00fed434da 100644 --- a/Mage/src/mage/target/common/TargetAttackingCreature.java +++ b/Mage/src/mage/target/common/TargetAttackingCreature.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author BetaSteward_at_googlemail.com */ -public class TargetAttackingCreature extends TargetPermanent { +public class TargetAttackingCreature extends TargetPermanent { public TargetAttackingCreature() { this(1, 1, new FilterAttackingCreature(), false); diff --git a/Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java b/Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java index c17a159f914..8906311fd5d 100644 --- a/Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java +++ b/Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author nantuko */ -public class TargetAttackingOrBlockingCreature extends TargetPermanent { +public class TargetAttackingOrBlockingCreature extends TargetPermanent { public TargetAttackingOrBlockingCreature() { this(1, 1, new FilterAttackingOrBlockingCreature(), false); diff --git a/Mage/src/mage/target/common/TargetBasicLandCard.java b/Mage/src/mage/target/common/TargetBasicLandCard.java index af6ad774cb4..2af22ab828c 100644 --- a/Mage/src/mage/target/common/TargetBasicLandCard.java +++ b/Mage/src/mage/target/common/TargetBasicLandCard.java @@ -38,7 +38,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetBasicLandCard extends TargetCard { +public class TargetBasicLandCard extends TargetCard { public TargetBasicLandCard(Zone zone) { super(zone); diff --git a/Mage/src/mage/target/common/TargetCardInASingleGraveyard.java b/Mage/src/mage/target/common/TargetCardInASingleGraveyard.java index 8bdd96ad012..9bfc4ef9567 100644 --- a/Mage/src/mage/target/common/TargetCardInASingleGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInASingleGraveyard.java @@ -43,7 +43,7 @@ import mage.target.TargetCard; */ -public class TargetCardInASingleGraveyard extends TargetCard { +public class TargetCardInASingleGraveyard extends TargetCard { public TargetCardInASingleGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); diff --git a/Mage/src/mage/target/common/TargetCardInExile.java b/Mage/src/mage/target/common/TargetCardInExile.java index 53a51bc62b3..f5c863988c7 100644 --- a/Mage/src/mage/target/common/TargetCardInExile.java +++ b/Mage/src/mage/target/common/TargetCardInExile.java @@ -43,7 +43,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetCardInExile extends TargetCard { +public class TargetCardInExile extends TargetCard { private UUID zoneId; private boolean allExileZones; diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/mage/target/common/TargetCardInGraveyard.java index 21e40fa013c..ff5c917555a 100644 --- a/Mage/src/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInGraveyard.java @@ -40,7 +40,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetCardInGraveyard extends TargetCard { +public class TargetCardInGraveyard extends TargetCard { public TargetCardInGraveyard() { this(1, 1, new FilterCard("card from a graveyard")); diff --git a/Mage/src/mage/target/common/TargetCardInHand.java b/Mage/src/mage/target/common/TargetCardInHand.java index f5a490494c9..fee6d73a367 100644 --- a/Mage/src/mage/target/common/TargetCardInHand.java +++ b/Mage/src/mage/target/common/TargetCardInHand.java @@ -40,7 +40,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetCardInHand extends TargetCard { +public class TargetCardInHand extends TargetCard { public TargetCardInHand() { this(1, 1, new FilterCard()); diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/mage/target/common/TargetCardInLibrary.java index 76d3408b886..d4cba9691b5 100644 --- a/Mage/src/mage/target/common/TargetCardInLibrary.java +++ b/Mage/src/mage/target/common/TargetCardInLibrary.java @@ -47,7 +47,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetCardInLibrary extends TargetCard { +public class TargetCardInLibrary extends TargetCard { private int librarySearchLimit; diff --git a/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java b/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java index 705bbd0dff5..f2555887c6d 100644 --- a/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java @@ -10,7 +10,7 @@ import mage.target.TargetCard; import java.util.UUID; -public class TargetCardInOpponentsGraveyard extends TargetCard { +public class TargetCardInOpponentsGraveyard extends TargetCard { protected boolean allFromOneOpponent; diff --git a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java index 8cf7d174f63..1c591533391 100644 --- a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java @@ -40,7 +40,7 @@ import mage.target.TargetCard; * * @author BetaSteward_at_googlemail.com */ -public class TargetCardInYourGraveyard extends TargetCard { +public class TargetCardInYourGraveyard extends TargetCard { public TargetCardInYourGraveyard() { this(1, 1, new FilterCard("card from your graveyard")); diff --git a/Mage/src/mage/target/common/TargetControlledPermanent.java b/Mage/src/mage/target/common/TargetControlledPermanent.java index 558ed587f4e..66ad8622726 100644 --- a/Mage/src/mage/target/common/TargetControlledPermanent.java +++ b/Mage/src/mage/target/common/TargetControlledPermanent.java @@ -37,7 +37,7 @@ import mage.target.TargetPermanent; * @author BetaSteward_at_googlemail.com * @param */ -public class TargetControlledPermanent> extends TargetPermanent> { +public class TargetControlledPermanent> extends TargetPermanent { public TargetControlledPermanent() { this(1, 1, new FilterControlledPermanent(), false); diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java b/Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java index f247599b112..e5dbac7f034 100644 --- a/Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java +++ b/Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author LevelX2 */ -public class TargetCreatureOrPlaneswalker> extends TargetPermanent> { +public class TargetCreatureOrPlaneswalker> extends TargetPermanent { public TargetCreatureOrPlaneswalker() { this(1, 1 ,new FilterCreatureOrPlaneswalkerPermanent(), false); diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlayer.java b/Mage/src/mage/target/common/TargetCreatureOrPlayer.java index bcbb19225fa..a6c0f66f6a6 100644 --- a/Mage/src/mage/target/common/TargetCreatureOrPlayer.java +++ b/Mage/src/mage/target/common/TargetCreatureOrPlayer.java @@ -47,7 +47,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class TargetCreatureOrPlayer extends TargetImpl { +public class TargetCreatureOrPlayer extends TargetImpl { protected FilterCreatureOrPlayer filter; diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java b/Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java index b5327623fae..294bfe59e86 100644 --- a/Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java +++ b/Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java @@ -48,7 +48,7 @@ import mage.target.TargetAmount; * * @author BetaSteward_at_googlemail.com */ -public class TargetCreatureOrPlayerAmount extends TargetAmount { +public class TargetCreatureOrPlayerAmount extends TargetAmount { protected FilterCreatureOrPlayer filter; diff --git a/Mage/src/mage/target/common/TargetCreaturePermanent.java b/Mage/src/mage/target/common/TargetCreaturePermanent.java index 4fcc832608d..648c76110df 100644 --- a/Mage/src/mage/target/common/TargetCreaturePermanent.java +++ b/Mage/src/mage/target/common/TargetCreaturePermanent.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author BetaSteward_at_googlemail.com */ -public class TargetCreaturePermanent extends TargetPermanent { +public class TargetCreaturePermanent extends TargetPermanent { public TargetCreaturePermanent() { this(1, 1, new FilterCreaturePermanent(), false); diff --git a/Mage/src/mage/target/common/TargetCreaturePermanentAmount.java b/Mage/src/mage/target/common/TargetCreaturePermanentAmount.java index 65fbe9fabd5..b31610b2b88 100644 --- a/Mage/src/mage/target/common/TargetCreaturePermanentAmount.java +++ b/Mage/src/mage/target/common/TargetCreaturePermanentAmount.java @@ -46,7 +46,7 @@ import mage.target.TargetAmount; * * @author North */ -public class TargetCreaturePermanentAmount extends TargetAmount { +public class TargetCreaturePermanentAmount extends TargetAmount { protected FilterCreaturePermanent filter; diff --git a/Mage/src/mage/target/common/TargetDefender.java b/Mage/src/mage/target/common/TargetDefender.java index 16a86a09987..6ecf4b84781 100644 --- a/Mage/src/mage/target/common/TargetDefender.java +++ b/Mage/src/mage/target/common/TargetDefender.java @@ -47,7 +47,7 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class TargetDefender extends TargetImpl { +public class TargetDefender extends TargetImpl { protected FilterPlaneswalkerOrPlayer filter; protected UUID attackerId; diff --git a/Mage/src/mage/target/common/TargetDiscard.java b/Mage/src/mage/target/common/TargetDiscard.java index 0a63e710171..5ff3aa7afd5 100644 --- a/Mage/src/mage/target/common/TargetDiscard.java +++ b/Mage/src/mage/target/common/TargetDiscard.java @@ -42,7 +42,7 @@ import mage.filter.predicate.other.OwnerIdPredicate; * * @author BetaSteward_at_googlemail.com */ -public class TargetDiscard extends TargetCard { +public class TargetDiscard extends TargetCard { private UUID playerId; diff --git a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java index 5ff21c271d4..aee9e221596 100644 --- a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java +++ b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java @@ -37,7 +37,7 @@ import mage.target.TargetPermanent; * * @param */ -public class TargetEnchantmentPermanent> extends TargetPermanent> { +public class TargetEnchantmentPermanent> extends TargetPermanent { public TargetEnchantmentPermanent(boolean required) { this(); diff --git a/Mage/src/mage/target/common/TargetLandPermanent.java b/Mage/src/mage/target/common/TargetLandPermanent.java index fc1937917cd..07fa729ff1a 100644 --- a/Mage/src/mage/target/common/TargetLandPermanent.java +++ b/Mage/src/mage/target/common/TargetLandPermanent.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author BetaSteward_at_googlemail.com */ -public class TargetLandPermanent> extends TargetPermanent> { +public class TargetLandPermanent> extends TargetPermanent { public TargetLandPermanent() { this(1, 1, new FilterLandPermanent(), false); diff --git a/Mage/src/mage/target/common/TargetNonlandPermanent.java b/Mage/src/mage/target/common/TargetNonlandPermanent.java index df0bee70b1e..2eb77d0c20c 100644 --- a/Mage/src/mage/target/common/TargetNonlandPermanent.java +++ b/Mage/src/mage/target/common/TargetNonlandPermanent.java @@ -35,7 +35,7 @@ import mage.target.TargetPermanent; * * @author BetaSteward_at_googlemail.com */ -public class TargetNonlandPermanent extends TargetPermanent { +public class TargetNonlandPermanent extends TargetPermanent { public TargetNonlandPermanent() { this(1, 1, false); diff --git a/Mage/src/mage/target/common/TargetOpponent.java b/Mage/src/mage/target/common/TargetOpponent.java index b26afef59ed..155ec723b82 100644 --- a/Mage/src/mage/target/common/TargetOpponent.java +++ b/Mage/src/mage/target/common/TargetOpponent.java @@ -40,7 +40,7 @@ import mage.target.TargetPlayer; * @author BetaSteward_at_googlemail.com * @author North */ -public class TargetOpponent extends TargetPlayer { +public class TargetOpponent extends TargetPlayer { public TargetOpponent() { this(false); diff --git a/Mage/src/mage/target/common/TargetPermanentOrPlayer.java b/Mage/src/mage/target/common/TargetPermanentOrPlayer.java index 73116d70706..54ca2d788ad 100644 --- a/Mage/src/mage/target/common/TargetPermanentOrPlayer.java +++ b/Mage/src/mage/target/common/TargetPermanentOrPlayer.java @@ -48,7 +48,7 @@ import java.util.UUID; * * @author nantuko */ -public class TargetPermanentOrPlayer extends TargetImpl { +public class TargetPermanentOrPlayer extends TargetImpl { protected FilterPermanentOrPlayer filter; protected FilterPermanent filterPermanent; diff --git a/Mage/src/mage/target/common/TargetSpellOrPermanent.java b/Mage/src/mage/target/common/TargetSpellOrPermanent.java index 76ca270fbea..09e81c48f97 100644 --- a/Mage/src/mage/target/common/TargetSpellOrPermanent.java +++ b/Mage/src/mage/target/common/TargetSpellOrPermanent.java @@ -48,7 +48,7 @@ import mage.target.TargetImpl; * * @author LevelX */ -public class TargetSpellOrPermanent extends TargetImpl { +public class TargetSpellOrPermanent extends TargetImpl { protected FilterSpellOrPermanent filter; protected FilterPermanent filterPermanent;