github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

[refactor] removed generic parameter from Phase

Browse source
This commit is contained in:
North 2014-06-03 11:47:04 +03:00
parent c5c23fac1a
commit a2e086a152
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/game/turn/BeginningPhase.java
View file

@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class BeginningPhase extends Phase<BeginningPhase> { public class BeginningPhase extends Phase {
public BeginningPhase() { public BeginningPhase() {
this.type = TurnPhase.BEGINNING; this.type = TurnPhase.BEGINNING;

2
Mage/src/mage/game/turn/CombatPhase.java
View file

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class CombatPhase extends Phase<CombatPhase> { public class CombatPhase extends Phase {
public CombatPhase() { public CombatPhase() {
this.type = TurnPhase.COMBAT; this.type = TurnPhase.COMBAT;

2
Mage/src/mage/game/turn/EndPhase.java
View file

@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class EndPhase extends Phase<EndPhase> { public class EndPhase extends Phase {
public EndPhase() { public EndPhase() {
this.type = TurnPhase.END; this.type = TurnPhase.END;

6
Mage/src/mage/game/turn/Phase.java
View file

@ -43,7 +43,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @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 TurnPhase type;
protected List<Step> steps = new ArrayList<Step>(); 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 Step currentStep;
protected int count; protected int count;
public abstract T copy(); public abstract Phase copy();
public Phase() {} public Phase() {}
public Phase(final Phase<T> phase) { public Phase(final Phase phase) {
this.type = phase.type; this.type = phase.type;
this.event = phase.event; this.event = phase.event;
this.preEvent = phase.preEvent; this.preEvent = phase.preEvent;

2
Mage/src/mage/game/turn/PostCombatMainPhase.java
View file

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class PostCombatMainPhase extends Phase<PostCombatMainPhase> { public class PostCombatMainPhase extends Phase {
public PostCombatMainPhase() { public PostCombatMainPhase() {
this.type = TurnPhase.POSTCOMBAT_MAIN; this.type = TurnPhase.POSTCOMBAT_MAIN;

2
Mage/src/mage/game/turn/PreCombatMainPhase.java
View file

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class PreCombatMainPhase extends Phase<PreCombatMainPhase> { public class PreCombatMainPhase extends Phase {
public PreCombatMainPhase() { public PreCombatMainPhase() {
this.type = TurnPhase.PRECOMBAT_MAIN; this.type = TurnPhase.PRECOMBAT_MAIN;