From ab37dd35c0b6dbf67dcdbfdff88ead991479e9c3 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Wed, 3 Aug 2016 08:44:56 +0000
Subject: [PATCH] CardTraitBase: move isSecondary from Trigger and
 ReplacementEffect to CardTraitBase to use it for all of them.

---
 .../src/main/java/forge/game/CardTraitBase.java  | 16 ++++++++++++++++
 .../game/replacement/ReplacementEffect.java      |  9 ---------
 .../main/java/forge/game/trigger/Trigger.java    | 16 ----------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index 59a281518a7..d8891b47cc0 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -126,6 +126,22 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView {
         this.hostCard = c;
     }
 
+    /**
+     * <p>
+     * isSecondary.
+     * </p>
+     * 
+     * @return a boolean.
+     */
+    public final boolean isSecondary() {
+        if (this.mapParams.containsKey("Secondary")) {
+            if (this.mapParams.get("Secondary").equals("True")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * <p>
      * matchesValid.
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
index 79c5a393ce7..bf9b739dee8 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -63,15 +63,6 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
         mapParams.putAll(map);
         this.setHostCard(host);
     }
-
-    /**
-     * Checks if is secondary.
-     *
-     * @return true, if is secondary
-     */
-    public final boolean isSecondary() {
-        return this.getMapParams().containsKey("Secondary");
-    }
 
     /**
      * Sets the checks for run.
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index 786aa5b97d0..a1d84eb7098 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -293,22 +293,6 @@ public abstract class Trigger extends TriggerReplacementBase {
         return true;
     }
 
-    /**
-     * <p>
-     * isSecondary.
-     * </p>
-     * 
-     * @return a boolean.
-     */
-    public final boolean isSecondary() {
-        if (this.mapParams.containsKey("Secondary")) {
-            if (this.mapParams.get("Secondary").equals("True")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /** {@inheritDoc} */
     @Override
     public final boolean equals(final Object o) {