From a2e086a15218cfb1ee9acfe61bd361dfdec5283d Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Tue, 3 Jun 2014 11:47:04 +0300
Subject: [PATCH] [refactor] removed generic parameter from Phase

---
 Mage/src/mage/game/turn/BeginningPhase.java      | 2 +-
 Mage/src/mage/game/turn/CombatPhase.java         | 2 +-
 Mage/src/mage/game/turn/EndPhase.java            | 2 +-
 Mage/src/mage/game/turn/Phase.java               | 6 +++---
 Mage/src/mage/game/turn/PostCombatMainPhase.java | 2 +-
 Mage/src/mage/game/turn/PreCombatMainPhase.java  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Mage/src/mage/game/turn/BeginningPhase.java b/Mage/src/mage/game/turn/BeginningPhase.java
index 9e0311f529..9dc338b970 100644
--- a/Mage/src/mage/game/turn/BeginningPhase.java
+++ b/Mage/src/mage/game/turn/BeginningPhase.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class BeginningPhase extends Phase<BeginningPhase> {
+public class BeginningPhase extends Phase {
 
     public BeginningPhase() {
         this.type = TurnPhase.BEGINNING;
diff --git a/Mage/src/mage/game/turn/CombatPhase.java b/Mage/src/mage/game/turn/CombatPhase.java
index 4973bcfa4c..19035e64c6 100644
--- a/Mage/src/mage/game/turn/CombatPhase.java
+++ b/Mage/src/mage/game/turn/CombatPhase.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CombatPhase extends Phase<CombatPhase> {
+public class CombatPhase extends Phase {
 
     public CombatPhase() {
         this.type = TurnPhase.COMBAT;
diff --git a/Mage/src/mage/game/turn/EndPhase.java b/Mage/src/mage/game/turn/EndPhase.java
index 55a7782349..0572f1f9f4 100644
--- a/Mage/src/mage/game/turn/EndPhase.java
+++ b/Mage/src/mage/game/turn/EndPhase.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EndPhase extends Phase<EndPhase> {
+public class EndPhase extends Phase {
 
     public EndPhase() {
         this.type = TurnPhase.END;
diff --git a/Mage/src/mage/game/turn/Phase.java b/Mage/src/mage/game/turn/Phase.java
index 34fc79967e..51862172bc 100644
--- a/Mage/src/mage/game/turn/Phase.java
+++ b/Mage/src/mage/game/turn/Phase.java
@@ -43,7 +43,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class Phase<T extends Phase<T>> implements Serializable {
+public abstract class Phase implements Serializable {
 
     protected TurnPhase type;
     protected List<Step> steps = new ArrayList<Step>();
@@ -55,11 +55,11 @@ public abstract class Phase<T extends Phase<T>> implements Serializable {
     protected Step currentStep;
     protected int count;
 
-    public abstract T copy();
+    public abstract Phase copy();
 
     public Phase() {}
 
-    public Phase(final Phase<T> phase) {
+    public Phase(final Phase phase) {
         this.type = phase.type;
         this.event = phase.event;
         this.preEvent = phase.preEvent;
diff --git a/Mage/src/mage/game/turn/PostCombatMainPhase.java b/Mage/src/mage/game/turn/PostCombatMainPhase.java
index f20676c607..e5e6906504 100644
--- a/Mage/src/mage/game/turn/PostCombatMainPhase.java
+++ b/Mage/src/mage/game/turn/PostCombatMainPhase.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PostCombatMainPhase extends Phase<PostCombatMainPhase> {
+public class PostCombatMainPhase extends Phase {
 
     public PostCombatMainPhase() {
         this.type = TurnPhase.POSTCOMBAT_MAIN;
diff --git a/Mage/src/mage/game/turn/PreCombatMainPhase.java b/Mage/src/mage/game/turn/PreCombatMainPhase.java
index 0ac9a3ca34..e9d4e74889 100644
--- a/Mage/src/mage/game/turn/PreCombatMainPhase.java
+++ b/Mage/src/mage/game/turn/PreCombatMainPhase.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PreCombatMainPhase extends Phase<PreCombatMainPhase> {
+public class PreCombatMainPhase extends Phase {
 
     public PreCombatMainPhase() {
         this.type = TurnPhase.PRECOMBAT_MAIN;