changed targetPicker from raw type to proper type

src/magic/model/target/MagicBounceTargetPicker.java

@@ -8,7 +8,7 @@ import magic.model.stack.MagicCardOnStack;
 /** Creatures or spells from both players. */
 public class MagicBounceTargetPicker extends MagicTargetPicker<MagicTarget> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicBounceTargetPicker();
+	private static final MagicBounceTargetPicker INSTANCE = new MagicBounceTargetPicker();
 	
 	private MagicBounceTargetPicker() {}
 	
@@ -29,7 +29,7 @@ public class MagicBounceTargetPicker extends MagicTargetPicker<MagicTarget> {
         }
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicBounceTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicCountersTargetPicker.java

@@ -7,7 +7,7 @@ import magic.model.MagicPlayer;
 
 public class MagicCountersTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicCountersTargetPicker();
+	private static final MagicCountersTargetPicker INSTANCE = new MagicCountersTargetPicker();
 	
 	private MagicCountersTargetPicker() {}
 	
@@ -21,7 +21,7 @@ public class MagicCountersTargetPicker extends MagicTargetPicker<MagicPermanent>
 		return permanent.getController()==player?-score:score;
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicCountersTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicDeathtouchTargetPicker.java

@@ -7,7 +7,7 @@ import magic.model.MagicPlayer;
 
 public class MagicDeathtouchTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE = new MagicDeathtouchTargetPicker();
+	private static final MagicDeathtouchTargetPicker INSTANCE = new MagicDeathtouchTargetPicker();
 	
 	private static final int BLOCKED = 4<<8;
 	private static final int BLOCKING = 3<<8;
@@ -48,7 +48,7 @@ public class MagicDeathtouchTargetPicker extends MagicTargetPicker<MagicPermanen
 		return permanent.getPower(game) + score;
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicDeathtouchTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicDefaultTargetPicker.java

@@ -7,7 +7,7 @@ import java.util.Collection;
 
 public class MagicDefaultTargetPicker extends MagicTargetPicker<MagicTarget> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicDefaultTargetPicker();
+	private static final MagicDefaultTargetPicker INSTANCE = new MagicDefaultTargetPicker();
 	
 	private MagicDefaultTargetPicker() {}
 	
@@ -24,7 +24,7 @@ public class MagicDefaultTargetPicker extends MagicTargetPicker<MagicTarget> {
 		return options;
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicDefaultTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicExileTargetPicker.java

@@ -6,7 +6,7 @@ import magic.model.MagicPlayer;
 
 public class MagicExileTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicExileTargetPicker();
+	private static final MagicExileTargetPicker INSTANCE = new MagicExileTargetPicker();
 	
 	private MagicExileTargetPicker() {}
 	
@@ -16,7 +16,7 @@ public class MagicExileTargetPicker extends MagicTargetPicker<MagicPermanent> {
 		return permanent.getController()==player?-score:score;
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicExileTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicPowerTargetPicker.java

@@ -6,7 +6,7 @@ import magic.model.MagicPlayer;
 
 public class MagicPowerTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicPowerTargetPicker();
+	private static final MagicPowerTargetPicker INSTANCE = new MagicPowerTargetPicker();
 	
 	private MagicPowerTargetPicker() {}
 	
@@ -15,7 +15,7 @@ public class MagicPowerTargetPicker extends MagicTargetPicker<MagicPermanent> {
 		return permanent.getPower(game);
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicPowerTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicPreventTargetPicker.java

@@ -7,7 +7,7 @@ import magic.model.MagicPlayer;
 /** Creature permanent or player. */
 public class MagicPreventTargetPicker extends MagicTargetPicker<MagicTarget> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicPreventTargetPicker();
+	private static final MagicPreventTargetPicker INSTANCE = new MagicPreventTargetPicker();
 	
 	private MagicPreventTargetPicker() {}
 
@@ -20,7 +20,7 @@ public class MagicPreventTargetPicker extends MagicTargetPicker<MagicTarget> {
 		return 10-permanent.getToughness(game)+permanent.getDamage()-permanent.getPreventDamage();
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicPreventTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicRegenerateTargetPicker.java

@@ -7,7 +7,7 @@ import magic.model.MagicPlayer;
 
 public class MagicRegenerateTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE=new MagicRegenerateTargetPicker();
+	private static final MagicRegenerateTargetPicker INSTANCE = new MagicRegenerateTargetPicker();
 	
 	private MagicRegenerateTargetPicker() {}
 	
@@ -23,7 +23,7 @@ public class MagicRegenerateTargetPicker extends MagicTargetPicker<MagicPermanen
 		return 0;
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicRegenerateTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }

src/magic/model/target/MagicShadowTargetPicker.java

@@ -7,7 +7,7 @@ import magic.model.MagicPlayer;
 
 public class MagicShadowTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
-	private static final MagicTargetPicker INSTANCE = new MagicShadowTargetPicker();
+	private static final MagicShadowTargetPicker INSTANCE = new MagicShadowTargetPicker();
 	
 	private MagicShadowTargetPicker() {
 	}
@@ -46,7 +46,7 @@ public class MagicShadowTargetPicker extends MagicTargetPicker<MagicPermanent> {
 		return 10 + permanent.getPower(game);
 	}
 	
-	public static MagicTargetPicker getInstance() {
+	public static MagicShadowTargetPicker getInstance() {
 		return INSTANCE;
 	}
 }