remove raw type

src/magic/model/choice/MagicCardChoiceResult.java

@@ -7,7 +7,7 @@ import magic.model.MagicMappable;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public class MagicCardChoiceResult extends ArrayList<MagicCard> implements MagicMappable {
+public class MagicCardChoiceResult extends ArrayList<MagicCard> implements MagicMappable<MagicCardChoiceResult> {
 
     private static final long serialVersionUID = 1L;
 

src/magic/model/choice/MagicDeclareAttackersResult.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> implements MagicMappable {
+public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> implements MagicMappable<MagicDeclareAttackersResult> {
 
     private static final long serialVersionUID = 1L;
 

src/magic/model/choice/MagicDeclareBlockersResult.java

@@ -8,7 +8,7 @@ import java.util.Arrays;
 import java.util.LinkedList;
 
 /** First creature in array is the attacker, the other creatures are blockers. */
-public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]> implements MagicMappable,MagicScoreResult {
+public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]> implements MagicMappable<MagicDeclareBlockersResult>, MagicScoreResult {
 
     private static final long serialVersionUID = 1L;
 

src/magic/model/choice/MagicExcludeResult.java

@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class MagicExcludeResult implements MagicMappable {
+public class MagicExcludeResult implements MagicMappable<MagicExcludeResult> {
 
     private static final List<MagicPermanent> NO_EXCLUDE_PERMANENTS=Collections.emptyList();
 

src/magic/model/choice/MagicPlayChoiceResult.java

@@ -6,7 +6,7 @@ import magic.model.MagicSource;
 import magic.model.event.MagicActivation;
 import magic.model.event.MagicSourceActivation;
 
-public class MagicPlayChoiceResult implements MagicMappable {
+public class MagicPlayChoiceResult implements MagicMappable<MagicPlayChoiceResult> {
 
     public static final MagicPlayChoiceResult PASS=new MagicPlayChoiceResult(null);
     public static final MagicPlayChoiceResult SKIP=new MagicPlayChoiceResult(null);

src/magic/model/event/MagicSourceManaActivationResult.java

@@ -4,7 +4,7 @@ import magic.model.MagicGame;
 import magic.model.MagicMappable;
 import magic.model.MagicPermanent;
 
-public class MagicSourceManaActivationResult implements MagicMappable {
+public class MagicSourceManaActivationResult implements MagicMappable<MagicSourceManaActivationResult> {
 
     private final MagicPermanent permanent;
     private final MagicManaActivation activation;

src/magic/model/event/MagicSpellCardEvent.java

@@ -19,7 +19,7 @@ public abstract class MagicSpellCardEvent implements MagicCardEvent,MagicEventAc
         final String effect = rule.toLowerCase();
         final MagicRuleEventAction ruleAction = MagicRuleEventAction.build(effect);
         final MagicEventAction action  = ruleAction.action;
-        final MagicTargetPicker picker = ruleAction.picker;
+        final MagicTargetPicker<?> picker = ruleAction.picker;
         final MagicChoice choice = ruleAction.getChoice(effect);
 
         return new MagicSpellCardEvent() {