[refactor] removed generic parameter from Target

This commit is contained in:
North 2014-06-02 15:49:14 +03:00
parent 7af040e70b
commit 82a45cee88
57 changed files with 70 additions and 73 deletions

View file

@ -76,7 +76,7 @@ public class Outwit extends CardImpl<Outwit> {
return new Outwit(this);
}
private class CustomTargetSpell extends TargetObject<CustomTargetSpell> {
private class CustomTargetSpell extends TargetObject {
protected FilterSpell filter;

View file

@ -113,7 +113,7 @@ class StreamOfConsciousnessEffect extends OneShotEffect {
}
}
class StreamOfConsciousnessTarget extends TargetCard<StreamOfConsciousnessTarget> {
class StreamOfConsciousnessTarget extends TargetCard {
public StreamOfConsciousnessTarget() {
super(0, 4, Zone.GRAVEYARD, new FilterCard("cards from target player's graveyard"));

View file

@ -68,7 +68,7 @@ public class Reciprocate extends CardImpl<Reciprocate> {
}
class ReciprocateTarget extends TargetPermanent<ReciprocateTarget> {
class ReciprocateTarget extends TargetPermanent {
public ReciprocateTarget() {
super(1, 1, new FilterCreaturePermanent(), false);

View file

@ -75,7 +75,7 @@ public class Squelch extends CardImpl<Squelch> {
}
}
class ActivatedAbilityTarget extends TargetObject<ActivatedAbilityTarget> {
class ActivatedAbilityTarget extends TargetObject {
public ActivatedAbilityTarget() {
this.minNumberOfTargets = 1;

View file

@ -87,7 +87,7 @@ public class GiltspireAvenger extends CardImpl<GiltspireAvenger> {
}
}
class GiltspireAvengerTarget extends TargetPermanent<GiltspireAvengerTarget> {
class GiltspireAvengerTarget extends TargetPermanent {
public GiltspireAvengerTarget() {
super(1, 1, new FilterCreaturePermanent(), false);

View file

@ -206,7 +206,7 @@ class RavagerOfTheFellsEffect extends OneShotEffect {
}
class RavagerOfTheFellsTarget extends TargetPermanent<RavagerOfTheFellsTarget> {
class RavagerOfTheFellsTarget extends TargetPermanent {
public RavagerOfTheFellsTarget() {
super(0, 1, new FilterCreaturePermanent(), false);

View file

@ -110,7 +110,7 @@ class LoamingShamanEffect extends OneShotEffect {
}
}
class LoamingShamanTargetCardsInGraveyard extends TargetCard<LoamingShamanTargetCardsInGraveyard> {
class LoamingShamanTargetCardsInGraveyard extends TargetCard {
public LoamingShamanTargetCardsInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) {
super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter);

View file

@ -165,7 +165,7 @@ class BaneAlleyBrokerDrawExileEffect extends OneShotEffect {
}
}
class TargetCardInBaneAlleyBrokerExile extends TargetCard<TargetCardInBaneAlleyBrokerExile> {
class TargetCardInBaneAlleyBrokerExile extends TargetCard {
public TargetCardInBaneAlleyBrokerExile(UUID CardId) {
super(1, 1, Zone.EXILED, new FilterCard("card exiled with Bane Alley Broker"));

View file

@ -73,7 +73,7 @@ public class ExecutionersSwing extends CardImpl<ExecutionersSwing> {
}
}
class TargetCreaturePermanentThatDealtDamageThisTurn extends TargetPermanent<TargetCreaturePermanentThatDealtDamageThisTurn> {
class TargetCreaturePermanentThatDealtDamageThisTurn extends TargetPermanent {
public TargetCreaturePermanentThatDealtDamageThisTurn() {
super(1, 1, new FilterCreaturePermanent(), false);

View file

@ -117,7 +117,7 @@ class MemorysJourneyEffect extends OneShotEffect {
}
}
class MemorysJourneyTarget extends TargetCard<MemorysJourneyTarget> {
class MemorysJourneyTarget extends TargetCard {
public MemorysJourneyTarget() {
super(0, 3, Zone.GRAVEYARD, new FilterCard());

View file

@ -151,7 +151,7 @@ class TargetControlledPermanentSharingOpponentPermanentCardType extends TargetCo
}
class DaringThiefSecondTarget extends TargetPermanent<DaringThiefSecondTarget> {
class DaringThiefSecondTarget extends TargetPermanent {
private Permanent firstTarget = null;

View file

@ -146,7 +146,7 @@ class FaceUpPredicate implements Predicate<Card> {
}
}
class MirrorOfFateTarget extends TargetCard<MirrorOfFateTarget> {
class MirrorOfFateTarget extends TargetCard {
public MirrorOfFateTarget() {
super(0, 7, Zone.EXILED, new FilterCard());

View file

@ -139,7 +139,7 @@ class ChandraPyromasterEffect1 extends OneShotEffect {
}
}
class ChandraPyromasterTarget extends TargetPermanent<ChandraPyromasterTarget> {
class ChandraPyromasterTarget extends TargetPermanent {
public ChandraPyromasterTarget() {
super(0, 1, new FilterCreaturePermanent("creature that the targeted player controls"), false);

View file

@ -130,7 +130,7 @@ class StrionicResonatorEffect extends OneShotEffect {
}
}
class TargetTriggeredAbility extends TargetObject<TargetTriggeredAbility> {
class TargetTriggeredAbility extends TargetObject {
public TargetTriggeredAbility() {
this.minNumberOfTargets = 1;

View file

@ -94,7 +94,7 @@ public class AEtherBurst extends CardImpl<AEtherBurst> {
}
}
class DynamicTargetCreaturePermanent extends TargetPermanent<DynamicTargetCreaturePermanent> {
class DynamicTargetCreaturePermanent extends TargetPermanent {
private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creatures");

View file

@ -116,7 +116,7 @@ class DiaochanArtfulBeautyDestroyEffect extends OneShotEffect {
}
}
class TargetOpponentsChoiceCreaturePermanent extends TargetPermanent<TargetOpponentsChoiceCreaturePermanent> {
class TargetOpponentsChoiceCreaturePermanent extends TargetPermanent {
private UUID opponentId = null;

View file

@ -69,7 +69,7 @@ public class AvengingArrow extends CardImpl<AvengingArrow> {
}
}
class AvengingArrowTarget extends TargetPermanent<AvengingArrowTarget> {
class AvengingArrowTarget extends TargetPermanent {
public AvengingArrowTarget() {
super(1, 1, new FilterCreaturePermanent(), false);

View file

@ -87,7 +87,7 @@ public class NotOfThisWorld extends CardImpl<NotOfThisWorld> {
}
}
class TargetSpellTargetingControlledPermanent extends TargetObject<TargetSpellTargetingControlledPermanent> {
class TargetSpellTargetingControlledPermanent extends TargetObject {
public TargetSpellTargetingControlledPermanent() {

View file

@ -73,7 +73,7 @@ public class TurnAside extends CardImpl<TurnAside> {
return new TurnAside(this);
}
private class CustomTargetSpell extends TargetObject<CustomTargetSpell> {
private class CustomTargetSpell extends TargetObject {
protected FilterSpell filter;

View file

@ -120,7 +120,7 @@ class GaeasBlessingEffect extends OneShotEffect {
}
}
class GaeasBlessingTarget extends TargetCard<GaeasBlessingTarget> {
class GaeasBlessingTarget extends TargetCard {
public GaeasBlessingTarget() {
super(0, 3, Zone.GRAVEYARD, new FilterCard());

View file

@ -72,7 +72,7 @@ public class Intervene extends CardImpl<Intervene> {
return new Intervene(this);
}
private class InterveneTargetSpell extends TargetObject<InterveneTargetSpell> {
private class InterveneTargetSpell extends TargetObject {
public InterveneTargetSpell() {

View file

@ -121,7 +121,7 @@ class SearingBlazeEffect extends OneShotEffect {
}
class SearingBlazeTarget extends TargetPermanent<SearingBlazeTarget> {
class SearingBlazeTarget extends TargetPermanent {
public SearingBlazeTarget() {
super(1, 1, new FilterCreaturePermanent(), false);