External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 04:12:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[refactor] removed generic parameter from Step

Browse source
This commit is contained in:
North 2014-06-03 11:45:42 +03:00
parent 1867a150c1
commit c5c23fac1a
14 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class BeginCombatStep extends Step<BeginCombatStep> {
public class BeginCombatStep extends Step {
public BeginCombatStep() {
super(PhaseStep.BEGIN_COMBAT, true);

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

@ -38,7 +38,7 @@ import mage.players.Player;
*
* @author BetaSteward_at_googlemail.com
*/
public class CleanupStep extends Step<CleanupStep> {
public class CleanupStep extends Step {
public CleanupStep() {
super(PhaseStep.CLEANUP, true);

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

@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class CombatDamageStep extends Step<CombatDamageStep> {
public class CombatDamageStep extends Step {
public CombatDamageStep() {
super(PhaseStep.COMBAT_DAMAGE, true);

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

@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class DeclareAttackersStep extends Step<DeclareAttackersStep> {
public class DeclareAttackersStep extends Step {
public DeclareAttackersStep() {
super(PhaseStep.DECLARE_ATTACKERS, true);

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

@ -38,7 +38,7 @@ import java.util.UUID;
*
* @author BetaSteward_at_googlemail.com
*/
public class DeclareBlockersStep extends Step<DeclareBlockersStep> {
public class DeclareBlockersStep extends Step {
public DeclareBlockersStep() {
super(PhaseStep.DECLARE_BLOCKERS, true);

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

@ -38,7 +38,7 @@ import mage.players.Player;
*
* @author BetaSteward_at_googlemail.com
*/
public class DrawStep extends Step<DrawStep> {
public class DrawStep extends Step {
public DrawStep() {
super(PhaseStep.DRAW, true);

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

@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class EndOfCombatStep extends Step<EndOfCombatStep> {
public class EndOfCombatStep extends Step {
public EndOfCombatStep() {
super(PhaseStep.END_COMBAT, true);

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

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class EndStep extends Step<EndStep> {
public class EndStep extends Step {
public EndStep() {
super(PhaseStep.END_TURN, true);

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

@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class FirstCombatDamageStep extends Step<FirstCombatDamageStep> {
public class FirstCombatDamageStep extends Step {
public FirstCombatDamageStep() {
super(PhaseStep.FIRST_COMBAT_DAMAGE, true);

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

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class PostCombatMainStep extends Step<PostCombatMainStep> {
public class PostCombatMainStep extends Step {
public PostCombatMainStep() {
super(PhaseStep.POSTCOMBAT_MAIN, true);

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

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class PreCombatMainStep extends Step<PreCombatMainStep> {
public class PreCombatMainStep extends Step {
public PreCombatMainStep() {
super(PhaseStep.PRECOMBAT_MAIN, true);

5
Mage/src/mage/game/turn/Step.java
View file

@ -38,9 +38,8 @@ import mage.game.events.GameEvent.EventType;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public abstract class Step<T extends Step<T>> implements Serializable {
public abstract class Step implements Serializable {
private final PhaseStep type;
private final boolean hasPriority;
@ -53,7 +52,7 @@ public abstract class Step<T extends Step<T>> implements Serializable {
PRE, PRIORITY, POST;
}
public abstract T copy();
public abstract Step copy();
public Step(PhaseStep type, boolean hasPriority) {
this.type = type;

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

@ -38,7 +38,7 @@ import mage.players.Player;
*
* @author BetaSteward_at_googlemail.com
*/
public class UntapStep extends Step<UntapStep> {
public class UntapStep extends Step {
public UntapStep() {
super(PhaseStep.UNTAP, false);

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

@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
*
* @author BetaSteward_at_googlemail.com
*/
public class UpkeepStep extends Step<UpkeepStep> {
public class UpkeepStep extends Step {
public UpkeepStep() {
super(PhaseStep.UPKEEP, true);