Triggers: replace HashMap with java.util.Map in c-tors

src/main/java/forge/card/trigger/Trigger.java

@@ -174,12 +174,10 @@ public abstract class Trigger extends TriggerReplacementBase {
      * @param intrinsic
      *            the intrinsic
      */
-    public Trigger(final String n, final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public Trigger(final String n, final Map<String, String> params, final Card host, final boolean intrinsic) {
         this.name = n;
         this.setRunParams(new HashMap<String, Object>());
-        for (final Map.Entry<String, String> entry : params.entrySet()) {
+        this.getMapParams().putAll(params);
-            this.getMapParams().put(entry.getKey(), entry.getValue());
-        }
         this.setHostCard(host);
 
         this.setIntrinsic(intrinsic);
@@ -199,9 +197,7 @@ public abstract class Trigger extends TriggerReplacementBase {
      */
     public Trigger(final Map<String, String> params, final Card host, final boolean intrinsic) {
         this.setRunParams(new HashMap<String, Object>());
-        for (final Map.Entry<String, String> entry : params.entrySet()) {
+        this.getMapParams().putAll(params);
-            this.getMapParams().put(entry.getKey(), entry.getValue());
-        }
         this.setHostCard(host);
 
         this.setIntrinsic(intrinsic);

src/main/java/forge/card/trigger/TriggerAlways.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import forge.Card;
@@ -45,7 +44,7 @@ public class TriggerAlways extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerAlways(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerAlways(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerAttackerBlocked.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 
@@ -46,7 +45,7 @@ public class TriggerAttackerBlocked extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerAttackerBlocked(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerAttackerBlocked(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 
@@ -46,7 +45,7 @@ public class TriggerAttackerUnblocked extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerAttackerUnblocked(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerAttackerUnblocked(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerAttackersDeclared.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,7 +41,7 @@ public class TriggerAttackersDeclared extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerAttackersDeclared(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerAttackersDeclared(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerAttacks.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,7 +47,7 @@ public class TriggerAttacks extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerAttacks(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerAttacks(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerBecomesTarget.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 
@@ -47,7 +46,7 @@ public class TriggerBecomesTarget extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerBecomesTarget(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerBecomesTarget(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerBlocks.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 
@@ -46,7 +45,7 @@ public class TriggerBlocks extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerBlocks(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerBlocks(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerChampioned.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +43,7 @@ public class TriggerChampioned extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerChampioned(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerChampioned(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerChangesController.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -44,7 +42,7 @@ public class TriggerChangesController extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerChangesController(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerChangesController(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerChangesZone.java

@@ -17,7 +17,7 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import forge.Card;
 import forge.card.spellability.SpellAbility;
@@ -44,7 +44,7 @@ public class TriggerChangesZone extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerChangesZone(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerChangesZone(final Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerClashed.java

@@ -17,7 +17,7 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
+import java.util.Map;
 
 
 import forge.Card;
@@ -45,7 +45,7 @@ public class TriggerClashed extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerClashed(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerClashed(final Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerCounterAdded.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.Counters;
 import forge.card.spellability.SpellAbility;
@@ -45,7 +43,7 @@ public class TriggerCounterAdded extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerCounterAdded(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerCounterAdded(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerCounterRemoved.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.Counters;
 import forge.card.spellability.SpellAbility;
@@ -45,7 +43,7 @@ public class TriggerCounterRemoved extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerCounterRemoved(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerCounterRemoved(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerCycled.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerCycled extends Trigger {
      * @param intrinsic
      *            a boolean
      */
-    public TriggerCycled(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerCycled(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerDamageDone.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 import forge.util.Expressions;
@@ -45,7 +43,7 @@ public class TriggerDamageDone extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerDamageDone(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerDamageDone(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerDiscarded.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerDiscarded extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerDiscarded(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerDiscarded(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerDrawn.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -44,7 +42,7 @@ public class TriggerDrawn extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerDrawn(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerDrawn(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerLandPlayed.java

@@ -47,7 +47,7 @@ public class TriggerLandPlayed extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerLandPlayed(final String n, final HashMap<String, String> params, final Card host,
+    public TriggerLandPlayed(final String n, final java.util.Map<String, String> params, final Card host,
             final boolean intrinsic) {
         super(n, params, host, intrinsic);
     }

src/main/java/forge/card/trigger/TriggerLifeGained.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerLifeGained extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerLifeGained(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerLifeGained(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerLifeLost.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerLifeLost extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerLifeLost(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerLifeLost(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerLosesGame.java

@@ -1,7 +1,5 @@
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -22,7 +20,7 @@ public class TriggerLosesGame extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerLosesGame(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerLosesGame(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
     

src/main/java/forge/card/trigger/TriggerPhase.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerPhase extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerPhase(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerPhase(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerSacrificed.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerSacrificed extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerSacrificed(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerSacrificed(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerShuffled.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerShuffled extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerShuffled(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerShuffled(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Singletons;
 
 import forge.Card;
@@ -49,7 +47,7 @@ public class TriggerSpellAbilityCast extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerSpellAbilityCast(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerSpellAbilityCast(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerTaps.java

@@ -17,7 +17,7 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import forge.Card;
 import forge.card.spellability.SpellAbility;
@@ -44,7 +44,7 @@ public class TriggerTaps extends Trigger {
      * @param intrinsic
      *            a boolean
      */
-    public TriggerTaps(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerTaps(final Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerTapsForMana.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -44,7 +42,7 @@ public class TriggerTapsForMana extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerTapsForMana(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerTapsForMana(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerTransformed.java

@@ -17,7 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import forge.Card;
@@ -36,7 +35,7 @@ public class TriggerTransformed extends Trigger {
      * @param host the host
      * @param intrinsic the intrinsic
      */
-    public TriggerTransformed(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerTransformed(final Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerTurnFaceUp.java

@@ -17,9 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -45,7 +42,7 @@ public class TriggerTurnFaceUp extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerTurnFaceUp(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerTurnFaceUp(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerUnequip.java

@@ -17,8 +17,6 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
-
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 
@@ -44,7 +42,7 @@ public class TriggerUnequip extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerUnequip(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerUnequip(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 

src/main/java/forge/card/trigger/TriggerUntaps.java

@@ -17,7 +17,7 @@
  */
 package forge.card.trigger;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import forge.Card;
 import forge.card.spellability.SpellAbility;
@@ -44,7 +44,7 @@ public class TriggerUntaps extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerUntaps(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerUntaps(final Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }