[refactor] removed generic parameter from Target

Mage/src/mage/target/TargetAmount.java

@@ -39,9 +39,8 @@ import mage.players.Player;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class TargetAmount<T extends TargetAmount<T>> extends TargetImpl<T> {
+public abstract class TargetAmount extends TargetImpl {
 
     boolean amountWasSet = false;
     DynamicValue amount;
@@ -65,6 +64,9 @@ public abstract class TargetAmount<T extends TargetAmount<T>> extends TargetImpl
         this.amountWasSet = target.amountWasSet;
     }
 
+    @Override
+    public abstract TargetAmount copy();
+
     public int getAmountRemaining() {
         return remainingAmount;
     }
@@ -127,8 +129,8 @@ public abstract class TargetAmount<T extends TargetAmount<T>> extends TargetImpl
     }
 
     @Override
-    public List<T> getTargetOptions(Ability source, Game game) {
-        List<T> options = new ArrayList<>();
+    public List<? extends TargetAmount> getTargetOptions(Ability source, Game game) {
+        List<TargetAmount> options = new ArrayList<>();
         Set<UUID> possibleTargets = possibleTargets(source.getSourceId(), source.getControllerId(), game);
 
         addTargets(this, possibleTargets, options, source, game);
@@ -136,13 +138,13 @@ public abstract class TargetAmount<T extends TargetAmount<T>> extends TargetImpl
         return options;
     }
 
-    protected void addTargets(TargetAmount<T> target, Set<UUID> targets, List<T> options, Ability source, Game game) {
+    protected void addTargets(TargetAmount target, Set<UUID> targets, List<TargetAmount> 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) {

Mage/src/mage/target/TargetCard.java

@@ -42,9 +42,8 @@ import java.util.UUID;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public class TargetCard<T extends TargetCard<T>> extends TargetObject<TargetCard<T>> {
+public class TargetCard extends TargetObject {
 
     protected FilterCard filter;
 

Mage/src/mage/target/TargetImpl.java

@@ -42,9 +42,8 @@ import java.util.*;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class TargetImpl<T extends TargetImpl<T>> implements Target {
+public abstract class TargetImpl implements Target {
 
     protected Map<UUID, Integer> targets = new LinkedHashMap<>();
     protected Map<UUID, Integer> zoneChangeCounters = new HashMap<>();
@@ -60,7 +59,7 @@ public abstract class TargetImpl<T extends TargetImpl<T>> 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<T extends TargetImpl<T>> implements Target {
         this.notTarget = notTarget;
     }
 
-    public TargetImpl(final TargetImpl<T> 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<T extends TargetImpl<T>> implements Target {
     }
 
     @Override
-    public List<T> getTargetOptions(Ability source, Game game) {
-        List<T> options = new ArrayList<T>();
+    public List<? extends TargetImpl> getTargetOptions(Ability source, Game game) {
+        List<TargetImpl> options = new ArrayList<>();
         Set<UUID> possibleTargets = possibleTargets(source.getSourceId(), source.getControllerId(), game);
         possibleTargets.removeAll(getTargets());
         Iterator<UUID> 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()) {

Mage/src/mage/target/TargetObject.java

@@ -38,9 +38,8 @@ import java.util.UUID;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class TargetObject<T extends TargetObject<T>> extends TargetImpl<T> {
+public abstract class TargetObject extends TargetImpl {
 
     protected TargetObject() {}
 

Mage/src/mage/target/TargetPermanent.java

@@ -42,9 +42,8 @@ import mage.game.permanent.Permanent;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public class TargetPermanent<T extends TargetPermanent<T>> extends TargetObject<TargetPermanent<T>> {
+public class TargetPermanent extends TargetObject {
 
     protected FilterPermanent filter;
 
@@ -79,7 +78,7 @@ public class TargetPermanent<T extends TargetPermanent<T>> extends TargetObject<
         this.notTarget = notTarget;
     }
 
-    public TargetPermanent(final TargetPermanent<T> target) {
+    public TargetPermanent(final TargetPermanent target) {
         super(target);
         this.filter = target.filter.copy();
     }

Mage/src/mage/target/TargetPlayer.java

@@ -42,7 +42,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetPlayer<T extends TargetPlayer<T>> extends TargetImpl<TargetPlayer<T>> {
+public class TargetPlayer extends TargetImpl {
 
     protected FilterPlayer filter;
 

Mage/src/mage/target/TargetSource.java

@@ -46,7 +46,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetSource extends TargetObject<TargetSource> {
+public class TargetSource extends TargetObject {
 
     protected FilterObject filter;
 

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<TargetSpell> {
+public class TargetSpell extends TargetObject {
 
     protected FilterSpell filter;
 

Mage/src/mage/target/TargetStackObject.java

@@ -42,7 +42,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetStackObject extends TargetObject<TargetStackObject> {
+public class TargetStackObject extends TargetObject {
 
     protected FilterStackObject filter;
 

Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java

@@ -47,7 +47,7 @@ import mage.target.TargetObject;
  */
 
 
-public class TargetActivatedOrTriggeredAbility extends TargetObject<TargetActivatedOrTriggeredAbility> {
+public class TargetActivatedOrTriggeredAbility extends TargetObject {
 
         public TargetActivatedOrTriggeredAbility() {
         this.minNumberOfTargets = 1;

Mage/src/mage/target/common/TargetArtifactPermanent.java

@@ -33,9 +33,8 @@ import mage.target.TargetPermanent;
 
 /**
  * @author ayratn
- * @param <T>
  */
-public class TargetArtifactPermanent<T extends TargetArtifactPermanent<T>> extends TargetPermanent<TargetArtifactPermanent<T>> {
+public class TargetArtifactPermanent extends TargetPermanent {
 
     public TargetArtifactPermanent(boolean required) {
         this();

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<TargetAttackingCreature> {
+public class TargetAttackingCreature extends TargetPermanent {
 
     public TargetAttackingCreature() {
         this(1, 1, new FilterAttackingCreature(), false);

Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java

@@ -35,7 +35,7 @@ import mage.target.TargetPermanent;
  *
  * @author nantuko
  */
-public class TargetAttackingOrBlockingCreature extends TargetPermanent<TargetAttackingOrBlockingCreature> {
+public class TargetAttackingOrBlockingCreature extends TargetPermanent {
 
     public TargetAttackingOrBlockingCreature() {
         this(1, 1, new FilterAttackingOrBlockingCreature(), false);

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<TargetBasicLandCard> {
+public class TargetBasicLandCard extends TargetCard {
 
     public TargetBasicLandCard(Zone zone) {
         super(zone);

Mage/src/mage/target/common/TargetCardInASingleGraveyard.java

@@ -43,7 +43,7 @@ import mage.target.TargetCard;
  */
 
 
-public class TargetCardInASingleGraveyard extends TargetCard<TargetCardInASingleGraveyard> {
+public class TargetCardInASingleGraveyard extends TargetCard {
 
     public TargetCardInASingleGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) {
         super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter);

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<TargetCardInExile> {
+public class TargetCardInExile extends TargetCard {
 
     private UUID zoneId;
     private boolean allExileZones;

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<TargetCardInGraveyard> {
+public class TargetCardInGraveyard extends TargetCard {
 
     public TargetCardInGraveyard() {
         this(1, 1, new FilterCard("card from a graveyard"));

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<TargetCardInHand> {
+public class TargetCardInHand extends TargetCard {
 
     public TargetCardInHand() {
         this(1, 1, new FilterCard());

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<TargetCardInLibrary> {
+public class TargetCardInLibrary extends TargetCard {
 
     private int librarySearchLimit;
 

Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java

@@ -10,7 +10,7 @@ import mage.target.TargetCard;
 import java.util.UUID;
 
 
-public class TargetCardInOpponentsGraveyard extends TargetCard<TargetCardInOpponentsGraveyard> {
+public class TargetCardInOpponentsGraveyard extends TargetCard {
 
     protected boolean allFromOneOpponent;
 

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<TargetCardInYourGraveyard> {
+public class TargetCardInYourGraveyard extends TargetCard {
 
     public TargetCardInYourGraveyard() {
         this(1, 1, new FilterCard("card from your graveyard"));

Mage/src/mage/target/common/TargetControlledPermanent.java

@@ -37,7 +37,7 @@ import mage.target.TargetPermanent;
  * @author BetaSteward_at_googlemail.com
  * @param <T>
  */
-public class TargetControlledPermanent<T extends TargetControlledPermanent<T>> extends TargetPermanent<TargetControlledPermanent<T>> {
+public class TargetControlledPermanent<T extends TargetControlledPermanent<T>> extends TargetPermanent {
 
     public TargetControlledPermanent() {
         this(1, 1, new FilterControlledPermanent(), false);

Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java

@@ -35,7 +35,7 @@ import mage.target.TargetPermanent;
  *
  * @author LevelX2
  */
-public class TargetCreatureOrPlaneswalker<T extends TargetCreatureOrPlaneswalker<T>> extends TargetPermanent<TargetCreatureOrPlaneswalker<T>> {
+public class TargetCreatureOrPlaneswalker<T extends TargetCreatureOrPlaneswalker<T>> extends TargetPermanent {
 
     public TargetCreatureOrPlaneswalker() {
         this(1, 1 ,new FilterCreatureOrPlaneswalkerPermanent(), false);

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<TargetCreatureOrPlayer> {
+public class TargetCreatureOrPlayer extends TargetImpl {
 
     protected FilterCreatureOrPlayer filter;
 

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<TargetCreatureOrPlayerAmount> {
+public class TargetCreatureOrPlayerAmount extends TargetAmount {
 
     protected FilterCreatureOrPlayer filter;
 

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<TargetCreaturePermanent> {
+public class TargetCreaturePermanent extends TargetPermanent {
 
     public TargetCreaturePermanent() {
         this(1, 1, new FilterCreaturePermanent(), false);

Mage/src/mage/target/common/TargetCreaturePermanentAmount.java

@@ -46,7 +46,7 @@ import mage.target.TargetAmount;
  *
  * @author North
  */
-public class TargetCreaturePermanentAmount extends TargetAmount<TargetCreaturePermanentAmount> {
+public class TargetCreaturePermanentAmount extends TargetAmount {
 
     protected FilterCreaturePermanent filter;
 

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<TargetDefender> {
+public class TargetDefender extends TargetImpl {
 
     protected FilterPlaneswalkerOrPlayer filter;
     protected UUID attackerId;

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<TargetDiscard> {
+public class TargetDiscard extends TargetCard {
 
     private UUID playerId;
 

Mage/src/mage/target/common/TargetEnchantmentPermanent.java

@@ -37,7 +37,7 @@ import mage.target.TargetPermanent;
  * 
  * @param <T>
  */
-public class TargetEnchantmentPermanent<T extends TargetEnchantmentPermanent<T>> extends TargetPermanent<TargetEnchantmentPermanent<T>> {
+public class TargetEnchantmentPermanent<T extends TargetEnchantmentPermanent<T>> extends TargetPermanent {
 
     public TargetEnchantmentPermanent(boolean required) {
         this();

Mage/src/mage/target/common/TargetLandPermanent.java

@@ -35,7 +35,7 @@ import mage.target.TargetPermanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetLandPermanent<T extends TargetLandPermanent<T>> extends TargetPermanent<TargetLandPermanent<T>> {
+public class TargetLandPermanent<T extends TargetLandPermanent<T>> extends TargetPermanent {
 
     public TargetLandPermanent() {
         this(1, 1, new FilterLandPermanent(), false);

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<TargetNonlandPermanent> {
+public class TargetNonlandPermanent extends TargetPermanent {
 
     public TargetNonlandPermanent() {
         this(1, 1, false);

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<TargetOpponent> {
+public class TargetOpponent extends TargetPlayer {
 
     public TargetOpponent() {
         this(false);

Mage/src/mage/target/common/TargetPermanentOrPlayer.java

@@ -48,7 +48,7 @@ import java.util.UUID;
  *
  * @author nantuko
  */
-public class TargetPermanentOrPlayer extends TargetImpl<TargetPermanentOrPlayer> {
+public class TargetPermanentOrPlayer extends TargetImpl {
 
     protected FilterPermanentOrPlayer filter;
     protected FilterPermanent filterPermanent;

Mage/src/mage/target/common/TargetSpellOrPermanent.java

@@ -48,7 +48,7 @@ import mage.target.TargetImpl;
  *
  * @author LevelX
  */
-public class TargetSpellOrPermanent extends TargetImpl<TargetSpellOrPermanent> {
+public class TargetSpellOrPermanent extends TargetImpl {
 
     protected FilterSpellOrPermanent filter;
     protected FilterPermanent filterPermanent;