From 9eb078842b5ac0502599343b312cd1c24606075d Mon Sep 17 00:00:00 2001
From: JOAC69 <joac69@gmail.com>
Date: Sun, 25 Sep 2016 00:18:37 -0500
Subject: [PATCH] Refactor - moved KorAllyToken to shared area

---
 .../battleforzendikar/RetreatToEmeria.java    | 19 +++----------------
 .../sets/battleforzendikar/UnifiedFront.java  |  1 +
 .../oathofthegatewatch/CaptainsClaws.java     | 17 ++---------------
 .../sets/oathofthegatewatch/OathOfGideon.java |  1 +
 .../game/permanent/token/KorAllyToken.java    | 18 ++++++++++++++++++
 5 files changed, 25 insertions(+), 31 deletions(-)
 create mode 100644 Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java

diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToEmeria.java b/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToEmeria.java
index 6aa51bd4f3..204cbe4f4c 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToEmeria.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/RetreatToEmeria.java
@@ -27,8 +27,6 @@
  */
 package mage.sets.battleforzendikar;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Mode;
 import mage.abilities.common.LandfallAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -37,7 +35,9 @@ import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KorAllyToken;
+
+import java.util.UUID;
 
 /**
  *
@@ -66,16 +66,3 @@ public class RetreatToEmeria extends CardImpl {
         return new RetreatToEmeria(this);
     }
 }
-
-class KorAllyToken extends Token {
-
-    public KorAllyToken() {
-        super("Kor Ally", "1/1 white Kor Ally creature token");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Kor");
-        subtype.add("Ally");
-        color.setWhite(true);
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/UnifiedFront.java b/Mage.Sets/src/mage/sets/battleforzendikar/UnifiedFront.java
index 326a346cda..623110aba3 100644
--- a/Mage.Sets/src/mage/sets/battleforzendikar/UnifiedFront.java
+++ b/Mage.Sets/src/mage/sets/battleforzendikar/UnifiedFront.java
@@ -35,6 +35,7 @@ import mage.cards.CardImpl;
 import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.Rarity;
+import mage.game.permanent.token.KorAllyToken;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/CaptainsClaws.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/CaptainsClaws.java
index 1f72a6e594..892baf8d35 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/CaptainsClaws.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/CaptainsClaws.java
@@ -28,7 +28,7 @@
 package mage.sets.oathofthegatewatch;
 
 import java.util.UUID;
-import mage.MageInt;
+
 import mage.abilities.common.AttacksAttachedTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -40,7 +40,7 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KorAllyToken;
 
 /**
  *
@@ -71,16 +71,3 @@ public class CaptainsClaws extends CardImpl {
     }
 }
 
-class KorAllyToken extends Token {
-
-    public KorAllyToken() {
-        super("Kor Ally", "1/1 white Kor Ally creature token");
-        this.setExpansionSetCodeForImage("BFZ");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Kor");
-        subtype.add("Ally");
-        color.setWhite(true);
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/OathOfGideon.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/OathOfGideon.java
index ef86899d70..cb6a9300b5 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/OathOfGideon.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/OathOfGideon.java
@@ -44,6 +44,7 @@ import mage.game.Game;
 import mage.game.events.EntersTheBattlefieldEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.token.KorAllyToken;
 
 /**
  *
diff --git a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java
new file mode 100644
index 0000000000..c8a39ccb32
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java
@@ -0,0 +1,18 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+
+public class KorAllyToken extends Token {
+
+    public KorAllyToken() {
+        super("Kor Ally", "1/1 white Kor Ally creature token");
+        this.setExpansionSetCodeForImage("BFZ");
+        cardType.add(CardType.CREATURE);
+        subtype.add("Kor");
+        subtype.add("Ally");
+        color.setWhite(true);
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+    }
+}