[refactoring][filters] Unneeded use of generics was removed

Mage.Sets/src/mage/sets/avacynrestored/SecondGuess.java

@@ -68,7 +68,7 @@ public class SecondGuess extends CardImpl<SecondGuess> {
     }
 }
 
-class FilterSecondSpell extends FilterSpell<FilterSecondSpell> {
+class FilterSecondSpell extends FilterSpell {
 
     public FilterSecondSpell() {
         super("spell that's the second spell cast this turn");
@@ -119,16 +119,14 @@ class FilterSecondSpell extends FilterSpell<FilterSecondSpell> {
         return new FilterSecondSpell(this);
     }
 
+    @Override
     public void setFromZone(Constants.Zone fromZone) {
         this.fromZone = fromZone;
     }
 
+    @Override
     public void setNotFromZone(boolean notFromZone) {
         this.notFromZone = notFromZone;
     }
 
 }
-
-
-
-

Mage.Sets/src/mage/sets/innistrad/EvilTwin.java

@@ -82,7 +82,7 @@ public class EvilTwin extends CardImpl<EvilTwin> {
     }
 }
 
-class EvilTwinFilter extends FilterCreaturePermanent<EvilTwinFilter> {
+class EvilTwinFilter extends FilterCreaturePermanent {
 
     public EvilTwinFilter() {
         super("creature with the same name as this creature");

Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java

@@ -65,7 +65,7 @@ public class UrgentExorcism extends CardImpl<UrgentExorcism> {
     }
 }
 
-class FilterSpiritOrEnchantment extends FilterPermanent<FilterSpiritOrEnchantment> {
+class FilterSpiritOrEnchantment extends FilterPermanent {
 
     public FilterSpiritOrEnchantment() {
         super("Spirit or enchantment");

Mage/src/mage/filter/FilterAbility.java

@@ -41,7 +41,7 @@ import java.util.List;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterAbility<T extends Ability> extends FilterImpl<T, FilterAbility<T>> {
+public class FilterAbility<T extends Ability> extends FilterImpl<T> {
 
     protected static ListComparer<Outcome> compOutcome = new ListComparer<Outcome>();
 

Mage/src/mage/filter/FilterCard.java

@@ -38,7 +38,7 @@ import java.util.*;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCard<T extends FilterCard<T>> extends FilterObject<Card, FilterCard<T>> {
+public class FilterCard extends FilterObject<Card> {
 
     private static final long serialVersionUID = 1L;
 
@@ -62,7 +62,7 @@ public class FilterCard<T extends FilterCard<T>> extends FilterObject<Card, Filt
         super(name);
     }
 
-    public FilterCard(FilterCard<T> filter) {
+    public FilterCard(FilterCard filter) {
         super(filter);
         this.ownerId.addAll(filter.ownerId);
         this.notOwner = filter.notOwner;
@@ -187,7 +187,7 @@ public class FilterCard<T extends FilterCard<T>> extends FilterObject<Card, Filt
     }
 
     @Override
-    public FilterCard<T> copy() {
+    public FilterCard copy() {
-        return new FilterCard<T>(this);
+        return new FilterCard(this);
     }
 }

Mage/src/mage/filter/FilterImpl.java

@@ -38,14 +38,14 @@ import mage.game.Game;
  * @author BetaSteward_at_googlemail.com
  * @author North
  */
-public abstract class FilterImpl<E, T extends FilterImpl<E, T>> implements Filter<E> {
+public abstract class FilterImpl<E> implements Filter<E> {
 
     protected List<Predicate> predicates = new ArrayList<Predicate>();
     protected String message;
     protected boolean notFilter = false;
 
     @Override
-    public abstract FilterImpl<E, T> copy();
+    public abstract FilterImpl<E> copy();
 
     public FilterImpl(String name) {
         this.message = name;

Mage/src/mage/filter/FilterObject.java

@@ -34,11 +34,11 @@ import mage.MageObject;
  *
  * @author North
  */
-public class FilterObject<E extends MageObject, T extends FilterObject<E, T>> extends FilterImpl<E, T> {
+public class FilterObject<E extends MageObject> extends FilterImpl<E> {
 
     @Override
-    public FilterObject<E, T> copy() {
+    public FilterObject<E> copy() {
-        return new FilterObject<E, T>(this);
+        return new FilterObject<E>(this);
     }
 
     public FilterObject(String name) {

Mage/src/mage/filter/FilterPermanent.java

@@ -40,7 +40,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<Permanent, FilterPermanent<T>> {
+public class FilterPermanent extends FilterObject<Permanent> {
     protected List<UUID> ownerId = new ArrayList<UUID>();
     protected boolean notOwner;
     protected List<UUID> controllerId = new ArrayList<UUID>();
@@ -61,7 +61,7 @@ public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<
         super("permanent");
     }
 
-    public FilterPermanent(final FilterPermanent<T> filter) {
+    public FilterPermanent(final FilterPermanent filter) {
         super(filter);
         this.ownerId = new ArrayList<UUID>(filter.ownerId);
         this.notOwner = filter.notOwner;
@@ -227,8 +227,8 @@ public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<
     }
 
     @Override
-    public FilterPermanent<T> copy() {
+    public FilterPermanent copy() {
-        return new FilterPermanent<T>(this);
+        return new FilterPermanent(this);
     }
 
 }

Mage/src/mage/filter/FilterPlayer.java

@@ -40,7 +40,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterPlayer extends FilterImpl<Player, FilterPlayer> implements Filter<Player> {
+public class FilterPlayer extends FilterImpl<Player> {
 
     protected List<UUID> playerId = new ArrayList<UUID>();
     protected boolean notPlayer;

Mage/src/mage/filter/FilterSpell.java

@@ -39,7 +39,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterSpell<T extends FilterSpell<T>> extends FilterStackObject<FilterSpell<T>> {
+public class FilterSpell extends FilterStackObject {
 
     protected Zone fromZone = Zone.ALL;
     protected boolean notFromZone = false;    

Mage/src/mage/filter/FilterStackObject.java

@@ -40,7 +40,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterStackObject<T extends FilterStackObject<T>> extends FilterObject<StackObject, FilterStackObject<T>> {
+public class FilterStackObject extends FilterObject<StackObject> {
 
     protected List<UUID> controllerId = new ArrayList<UUID>();
     protected boolean notController = false;
@@ -54,7 +54,7 @@ public class FilterStackObject<T extends FilterStackObject<T>> extends FilterObj
         super(name);
     }
 
-    public FilterStackObject(final FilterStackObject<T> filter) {
+    public FilterStackObject(final FilterStackObject filter) {
         super(filter);
         this.controllerId.addAll(filter.controllerId);
         this.notController = filter.notController;

Mage/src/mage/filter/common/FilterArtifactCard.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author nantuko
  */
-public class FilterArtifactCard extends FilterCard<FilterArtifactCard> {
+public class FilterArtifactCard extends FilterCard {
 
     public FilterArtifactCard() {
         this("artifact");

Mage/src/mage/filter/common/FilterArtifactPermanent.java

@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author ayratn
  */
-public class FilterArtifactPermanent<T extends FilterArtifactPermanent<T>> extends FilterPermanent<FilterArtifactPermanent<T>> {
+public class FilterArtifactPermanent extends FilterPermanent {
 
     protected boolean useAttacking;
     protected boolean attacking;
@@ -54,7 +54,7 @@ public class FilterArtifactPermanent<T extends FilterArtifactPermanent<T>> exten
         this.add(new CardTypePredicate(CardType.ARTIFACT));
     }
 
-    public FilterArtifactPermanent(final FilterArtifactPermanent<T> filter) {
+    public FilterArtifactPermanent(final FilterArtifactPermanent filter) {
         super(filter);
         this.useAttacking = filter.useAttacking;
         this.attacking = filter.attacking;
@@ -98,7 +98,7 @@ public class FilterArtifactPermanent<T extends FilterArtifactPermanent<T>> exten
     }
 
     @Override
-    public FilterArtifactPermanent<T> copy() {
+    public FilterArtifactPermanent copy() {
-        return new FilterArtifactPermanent<T>(this);
+        return new FilterArtifactPermanent(this);
     }
 }

Mage/src/mage/filter/common/FilterAttackingCreature.java

@@ -32,7 +32,7 @@ package mage.filter.common;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterAttackingCreature extends FilterCreaturePermanent<FilterAttackingCreature> {
+public class FilterAttackingCreature extends FilterCreaturePermanent {
 
     public FilterAttackingCreature() {
         this("attacking creature");

Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java

@@ -32,7 +32,7 @@ package mage.filter.common;
  *
  * @author nantuko
  */
-public class FilterAttackingOrBlockingCreature extends FilterCreaturePermanent<FilterAttackingOrBlockingCreature> {
+public class FilterAttackingOrBlockingCreature extends FilterCreaturePermanent {
 
     public FilterAttackingOrBlockingCreature() {
         this("attacking or blocking creature");

Mage/src/mage/filter/common/FilterAura.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterAura extends FilterPermanent<FilterAura> {
+public class FilterAura extends FilterPermanent {
 
     public FilterAura() {
         this("aura");

Mage/src/mage/filter/common/FilterAuraCard.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author jeffwadsworth
  */
-public class FilterAuraCard extends FilterCard<FilterAuraCard> {
+public class FilterAuraCard extends FilterCard {
 
     public FilterAuraCard() {
         this("aura");

Mage/src/mage/filter/common/FilterBasicLandCard.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterBasicLandCard extends FilterCard<FilterBasicLandCard> {
+public class FilterBasicLandCard extends FilterCard {
 
     public FilterBasicLandCard() {
         super("basic land card");

Mage/src/mage/filter/common/FilterBlockedCreature.java

@@ -35,7 +35,7 @@ import mage.game.permanent.Permanent;
  *
  * @author North
  */
-public class FilterBlockedCreature extends FilterCreaturePermanent<FilterBlockingCreature> {
+public class FilterBlockedCreature extends FilterCreaturePermanent {
 
     public FilterBlockedCreature() {
         this("blocked creature");

Mage/src/mage/filter/common/FilterBlockingCreature.java

@@ -32,7 +32,7 @@ package mage.filter.common;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterBlockingCreature extends FilterCreaturePermanent<FilterBlockingCreature> {
+public class FilterBlockingCreature extends FilterCreaturePermanent {
 
     public FilterBlockingCreature() {
         this("Blocking creature");

Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java

@@ -35,7 +35,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterControlledCreaturePermanent<T extends FilterControlledCreaturePermanent> extends FilterControlledPermanent<FilterControlledCreaturePermanent<T>> {
+public class FilterControlledCreaturePermanent extends FilterControlledPermanent {
 
     public FilterControlledCreaturePermanent() {
         this("creature you control");

Mage/src/mage/filter/common/FilterControlledPermanent.java

@@ -35,7 +35,7 @@ import mage.filter.FilterPermanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterControlledPermanent<T extends FilterControlledPermanent<T>> extends FilterPermanent<FilterControlledPermanent<T>> {
+public class FilterControlledPermanent extends FilterPermanent {
 
     public FilterControlledPermanent() {
         this("permanent you control");

Mage/src/mage/filter/common/FilterCreatureCard.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCreatureCard extends FilterCard<FilterCreatureCard> {
+public class FilterCreatureCard extends FilterCard {
 
     public FilterCreatureCard() {
         this("creature card");

Mage/src/mage/filter/common/FilterCreatureForAttack.java

@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCreatureForAttack extends FilterCreaturePermanent<FilterCreatureForAttack> {
+public class FilterCreatureForAttack extends FilterCreaturePermanent {
 
     public FilterCreatureForAttack() {
         this("");

Mage/src/mage/filter/common/FilterCreatureForCombat.java

@@ -35,7 +35,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCreatureForCombat extends FilterCreaturePermanent<FilterCreatureForCombat> {
+public class FilterCreatureForCombat extends FilterCreaturePermanent {
 
     public FilterCreatureForCombat() {
         this("");

Mage/src/mage/filter/common/FilterCreatureOrPlayer.java

@@ -41,7 +41,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCreatureOrPlayer extends FilterImpl<Object, FilterCreatureOrPlayer> implements FilterInPlay<Object> {
+public class FilterCreatureOrPlayer extends FilterImpl<Object> implements FilterInPlay<Object> {
 
     protected FilterCreaturePermanent creatureFilter;
     protected FilterPlayer playerFilter;

Mage/src/mage/filter/common/FilterCreaturePermanent.java

@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> extends FilterPermanent<FilterCreaturePermanent<T>> {
+public class FilterCreaturePermanent extends FilterPermanent {
 
     protected boolean useAttacking;
     protected boolean attacking;
@@ -56,7 +56,7 @@ public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> exten
         this.add(new CardTypePredicate(CardType.CREATURE));
     }
 
-    public FilterCreaturePermanent(final FilterCreaturePermanent<T> filter) {
+    public FilterCreaturePermanent(final FilterCreaturePermanent filter) {
         super(filter);
         this.useAttacking = filter.useAttacking;
         this.attacking = filter.attacking;
@@ -137,7 +137,7 @@ public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> exten
     }
 
     @Override
-    public FilterCreaturePermanent<T> copy() {
+    public FilterCreaturePermanent copy() {
-        return new FilterCreaturePermanent<T>(this);
+        return new FilterCreaturePermanent(this);
     }
 }

Mage/src/mage/filter/common/FilterEnchantment.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author nantuko
  */
-public class FilterEnchantment extends FilterPermanent<FilterEnchantment> {
+public class FilterEnchantment extends FilterPermanent {
 
     public FilterEnchantment() {
         this("enchantment");

Mage/src/mage/filter/common/FilterEquipment.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterEquipment extends FilterPermanent<FilterEquipment> {
+public class FilterEquipment extends FilterPermanent {
 
     public FilterEquipment() {
         this("equipment");

Mage/src/mage/filter/common/FilterFortification.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterFortification extends FilterPermanent<FilterFortification> {
+public class FilterFortification extends FilterPermanent {
 
     public FilterFortification() {
         this("fortification");

Mage/src/mage/filter/common/FilterLandCard.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterLandCard extends FilterCard<FilterLandCard> {
+public class FilterLandCard extends FilterCard {
 
     public FilterLandCard() {
         this("land card");

Mage/src/mage/filter/common/FilterLandPermanent.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterLandPermanent extends FilterPermanent<FilterLandPermanent> {
+public class FilterLandPermanent extends FilterPermanent {
 
     public FilterLandPermanent() {
         this("land");

Mage/src/mage/filter/common/FilterLegendaryPermanent.java

@@ -35,7 +35,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterLegendaryPermanent extends FilterPermanent<FilterLegendaryPermanent> {
+public class FilterLegendaryPermanent extends FilterPermanent {
 
     public FilterLegendaryPermanent() {
         this("legend");

Mage/src/mage/filter/common/FilterNonTokenPermanent.java

@@ -37,7 +37,7 @@ import mage.game.permanent.PermanentToken;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterNonTokenPermanent extends FilterPermanent<FilterNonTokenPermanent> {
+public class FilterNonTokenPermanent extends FilterPermanent {
 
     public FilterNonTokenPermanent() {
         this("nontoken permanent");

Mage/src/mage/filter/common/FilterNonlandCard.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterNonlandCard extends FilterCard<FilterNonlandCard> {
+public class FilterNonlandCard extends FilterCard {
 
     public FilterNonlandCard() {
         this("nonland card");

Mage/src/mage/filter/common/FilterNonlandPermanent.java

@@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterNonlandPermanent extends FilterPermanent<FilterNonlandPermanent> {
+public class FilterNonlandPermanent extends FilterPermanent {
 
     public FilterNonlandPermanent() {
         this("nonland permanent");

Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java

@@ -37,7 +37,7 @@ import java.util.UUID;
  *
  * @author noxx
  */
-public class FilterNotPairedControlledCreaturePermanent extends FilterControlledCreaturePermanent<FilterNotPairedControlledCreaturePermanent> {
+public class FilterNotPairedControlledCreaturePermanent extends FilterControlledCreaturePermanent {
 
     public FilterNotPairedControlledCreaturePermanent() {
         this("not paired creature you control");

Mage/src/mage/filter/common/FilterPermanentOrPlayer.java

@@ -41,7 +41,7 @@ import java.util.UUID;
 /**
  * @author nantuko
  */
-public class FilterPermanentOrPlayer extends FilterImpl<Object, FilterPermanentOrPlayer> implements FilterInPlay<Object> {
+public class FilterPermanentOrPlayer extends FilterImpl<Object> implements FilterInPlay<Object> {
 
     protected FilterPermanent permanentFilter;
     protected FilterPlayer playerFilter;

Mage/src/mage/filter/common/FilterPermanentOrPlayerWithCounter.java

@@ -28,8 +28,6 @@
 
 package mage.filter.common;
 
-import mage.filter.FilterPermanent;
-import mage.filter.FilterPlayer;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -41,31 +39,20 @@ import java.util.UUID;
  */
 public class FilterPermanentOrPlayerWithCounter extends FilterPermanentOrPlayer {
 
-    protected FilterPermanent permanentFilter;
-    protected FilterPlayer playerFilter;
-
     public FilterPermanentOrPlayerWithCounter() {
         this("player or permanent with counters on them");
     }
 
     public FilterPermanentOrPlayerWithCounter(String name, UUID controllerId) {
-        super(name);
+        super(name, controllerId);
-        permanentFilter = new FilterPermanent();
-        playerFilter = new FilterPlayer();
-        permanentFilter.getControllerId().add(controllerId);
-        playerFilter.getPlayerId().add(controllerId);
     }
 
     public FilterPermanentOrPlayerWithCounter(String name) {
         super(name);
-        permanentFilter = new FilterPermanent();
-        playerFilter = new FilterPlayer();
     }
 
     public FilterPermanentOrPlayerWithCounter(final FilterPermanentOrPlayerWithCounter filter) {
         super(filter);
-        this.permanentFilter = filter.permanentFilter.copy();
-        this.playerFilter = filter.playerFilter.copy();
     }
 
     @Override

Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java

@@ -28,7 +28,6 @@
 
 package mage.filter.common;
 
-import mage.filter.Filter;
 import mage.filter.FilterImpl;
 import mage.filter.FilterPlayer;
 import mage.game.Game;
@@ -42,7 +41,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterPlaneswalkerOrPlayer extends FilterImpl<Object, FilterPlaneswalkerOrPlayer> implements Filter<Object> {
+public class FilterPlaneswalkerOrPlayer extends FilterImpl<Object> {
 
     protected FilterPlaneswalkerPermanent planeswalkerFilter;
     protected FilterPlayer playerFilter;

Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java

@@ -36,7 +36,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterPlaneswalkerPermanent extends FilterPermanent<FilterPlaneswalkerPermanent> {
+public class FilterPlaneswalkerPermanent extends FilterPermanent {
 
     public FilterPlaneswalkerPermanent() {
         this("planeswalker");

Mage/src/mage/filter/common/FilterSpellOrPermanent.java

@@ -43,7 +43,7 @@ import java.util.UUID;
  *
  * @author LevelX
  */
-public class FilterSpellOrPermanent extends FilterImpl<Object, FilterPermanentOrPlayer> implements FilterInPlay<Object> {
+public class FilterSpellOrPermanent extends FilterImpl<Object> implements FilterInPlay<Object> {
 
     protected FilterPermanent permanentFilter;
     protected FilterSpell spellFilter;

Mage/src/mage/filter/common/FilterToken.java

@@ -28,6 +28,7 @@
 
 package mage.filter.common;
 
+import mage.filter.predicate.Predicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.PermanentToken;
@@ -36,7 +37,7 @@ import mage.game.permanent.PermanentToken;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FilterToken<T extends FilterToken<T>> extends FilterCreaturePermanent<FilterToken<T>> {
+public class FilterToken extends FilterCreaturePermanent {
 
     public FilterToken() {
         this("creature token");
@@ -44,24 +45,28 @@ public class FilterToken<T extends FilterToken<T>> extends FilterCreaturePermane
 
     public FilterToken(String name) {
         super(name);
+        this.add(new TokenPredicate());
     }
 
-    public FilterToken(final FilterToken<T> filter) {
+    public FilterToken(final FilterToken filter) {
         super(filter);
     }
 
     @Override
-    public boolean match(Permanent permanent, Game game) {
+    public FilterToken copy() {
-        if (!(permanent instanceof PermanentToken))
+        return new FilterToken(this);
-            return notFilter;
-        if (!super.match(permanent, game))
-            return notFilter;
-
-        return !notFilter;
     }
 
-    @Override
+    private static final class TokenPredicate implements Predicate<Permanent> {
-    public FilterToken<T> copy() {
+
-        return new FilterToken<T>(this);
+        @Override
+        public boolean apply(Permanent input, Game game) {
+            return input instanceof PermanentToken;
+        }
+
+        @Override
+        public String toString() {
+            return "Token";
+        }
     }
 }

Mage/src/mage/filter/common/FilterUntappedCreature.java

@@ -32,7 +32,7 @@ package mage.filter.common;
  *
  * @author noxx
  */
-public class FilterUntappedCreature extends FilterCreaturePermanent<FilterUntappedCreature> {
+public class FilterUntappedCreature extends FilterCreaturePermanent {
 
     public FilterUntappedCreature() {
         this("untapped creature");