From 5f83ddf5bad5343cb5002ee260e66082855bc8a1 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Mon, 2 Jun 2014 21:53:34 +0300
Subject: [PATCH] [refactor] removed generic from remaining Target classes

---
 Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java    | 4 ++--
 Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java       | 2 +-
 .../mage/target/common/TargetControlledCreaturePermanent.java | 3 ++-
 Mage/src/mage/target/common/TargetControlledPermanent.java    | 3 +--
 Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java | 2 +-
 Mage/src/mage/target/common/TargetEnchantmentPermanent.java   | 4 +---
 Mage/src/mage/target/common/TargetLandPermanent.java          | 2 +-
 Mage/src/mage/target/common/TargetNonBasicLandPermanent.java  | 3 ++-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java b/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java
index 3484b24e8cb..17bf58391fd 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java
@@ -44,8 +44,8 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
+import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
-import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetOpponent;
 
 /**
@@ -112,7 +112,7 @@ class MagusOfTheArenaEffect extends OneShotEffect {
     }
 }
 
-class TargetOpponentsChoiceControlledCreaturePermanent extends TargetControlledPermanent<TargetOpponentsChoiceControlledCreaturePermanent> {
+class TargetOpponentsChoiceControlledCreaturePermanent extends TargetPermanent {
 
     private UUID opponentId = null;
 
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java
index 544e0d4f588..22f9e0ff5bd 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/DaringThief.java
@@ -85,7 +85,7 @@ public class DaringThief extends CardImpl {
     }
 }
 
-class TargetControlledPermanentSharingOpponentPermanentCardType extends TargetControlledPermanent<TargetControlledPermanentSharingOpponentPermanentCardType> {
+class TargetControlledPermanentSharingOpponentPermanentCardType extends TargetControlledPermanent {
     
     public TargetControlledPermanentSharingOpponentPermanentCardType() {
         super();
diff --git a/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java b/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java
index a010851e8b3..4bae14901fe 100644
--- a/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java
+++ b/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java
@@ -29,12 +29,13 @@
 package mage.target.common;
 
 import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.target.TargetPermanent;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetControlledCreaturePermanent extends TargetControlledPermanent<TargetControlledCreaturePermanent> {
+public class TargetControlledCreaturePermanent extends TargetPermanent {
 
     public TargetControlledCreaturePermanent() {
         this(1, 1, new FilterControlledCreaturePermanent(), false);
diff --git a/Mage/src/mage/target/common/TargetControlledPermanent.java b/Mage/src/mage/target/common/TargetControlledPermanent.java
index 66ad8622726..e1eaccfa2da 100644
--- a/Mage/src/mage/target/common/TargetControlledPermanent.java
+++ b/Mage/src/mage/target/common/TargetControlledPermanent.java
@@ -35,9 +35,8 @@ import mage.target.TargetPermanent;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public class TargetControlledPermanent<T extends TargetControlledPermanent<T>> 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 e5dbac7f034..d15a3b23a5a 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<T extends TargetCreatureOrPlaneswalker<T>> extends TargetPermanent {
+public class TargetCreatureOrPlaneswalker extends TargetPermanent {
 
     public TargetCreatureOrPlaneswalker() {
         this(1, 1 ,new FilterCreatureOrPlaneswalkerPermanent(), false);
diff --git a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java
index aee9e221596..23c425ad81f 100644
--- a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java
+++ b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java
@@ -34,10 +34,8 @@ import mage.target.TargetPermanent;
 /**
  *
  * @author LevelX2
- * 
- * @param <T>
  */
-public class TargetEnchantmentPermanent<T extends TargetEnchantmentPermanent<T>> 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 07fa729ff1a..0f7231b3b74 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<T extends TargetLandPermanent<T>> extends TargetPermanent {
+public class TargetLandPermanent extends TargetPermanent {
 
     public TargetLandPermanent() {
         this(1, 1, new FilterLandPermanent(), false);
diff --git a/Mage/src/mage/target/common/TargetNonBasicLandPermanent.java b/Mage/src/mage/target/common/TargetNonBasicLandPermanent.java
index 635b7d462cb..1c058f9d05c 100644
--- a/Mage/src/mage/target/common/TargetNonBasicLandPermanent.java
+++ b/Mage/src/mage/target/common/TargetNonBasicLandPermanent.java
@@ -30,12 +30,13 @@ package mage.target.common;
 
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.NamePredicate;
+import mage.target.TargetPermanent;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TargetNonBasicLandPermanent extends TargetLandPermanent<TargetNonBasicLandPermanent> {
+public class TargetNonBasicLandPermanent extends TargetPermanent {
 
     public TargetNonBasicLandPermanent() {
         filter.add(Predicates.not(new NamePredicate("Island")));