[refactor] moved enums from Constants class

This commit is contained in:
North 2013-06-16 12:28:10 +03:00
parent 4d16535709
commit 0bb110be45
7372 changed files with 28700 additions and 27583 deletions

View file

@ -1,8 +1,9 @@
package mage.interfaces.rate;
import java.util.List;
import mage.Constants;
import mage.cards.Card;
import mage.constants.ColoredManaSymbol;
/**
* Interface for the class responsible for rating cards.
@ -11,5 +12,5 @@ import mage.cards.Card;
*/
public interface RateCallback {
int rateCard(Card card);
Card getBestBasicLand(Constants.ColoredManaSymbol color, List<String> setsToUse);
Card getBestBasicLand(ColoredManaSymbol color, List<String> setsToUse);
}

View file

@ -1,6 +1,6 @@
package mage.utils;
import mage.Constants.CardType;
import mage.constants.CardType;
import mage.cards.Card;
import mage.cards.MagePermanent;
import mage.view.CardView;

View file

@ -1,7 +1,7 @@
package mage.utils;
import mage.Constants;
import mage.Constants.ColoredManaSymbol;
import mage.constants.CardType;
import mage.constants.ColoredManaSymbol;
import mage.Mana;
import mage.cards.Card;
import mage.cards.decks.Deck;
@ -210,13 +210,13 @@ public class DeckBuilder {
this.card = card;
int type = 0;
if (card.getCardType().contains(Constants.CardType.CREATURE)) {
if (card.getCardType().contains(CardType.CREATURE)) {
type = 10;
} else if (card.getSubtype().contains("Equipment")) {
type = 8;
} else if (card.getSubtype().contains("Aura")) {
type = 5;
} else if (card.getCardType().contains(Constants.CardType.INSTANT)) {
} else if (card.getCardType().contains(CardType.INSTANT)) {
type = 7;
} else {
type = 6;

View file

@ -29,7 +29,7 @@
package mage.view;
import java.util.ArrayList;
import mage.Constants.CardType;
import mage.constants.CardType;
import mage.ObjectColor;
import mage.abilities.Ability;

View file

@ -28,12 +28,13 @@
package mage.view;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageObject;
import mage.ObjectColor;
import mage.cards.Card;
import mage.constants.SpellAbilityType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
@ -112,7 +113,7 @@ public class CardView extends SimpleCardView {
if (card.isSplitCard()) {
splitCard = (SplitCard) card;
} else {
if (card instanceof Spell && ((Spell) card).getSpellAbility().getSpellAbilityType().equals(Constants.SpellAbilityType.SPLIT_FUSED)) {
if (card instanceof Spell && ((Spell) card).getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) {
splitCard = (SplitCard) ((Spell) card).getCard();
}
}
@ -217,7 +218,7 @@ public class CardView extends SimpleCardView {
this.rarity = Rarity.NA;
this.rules = new ArrayList<String>();
this.rules.add(stackAbility.getRule());
if (stackAbility.getZone().equals(Constants.Zone.COMMAND)) {
if (stackAbility.getZone().equals(Zone.COMMAND)) {
this.expansionSetCode = stackAbility.getExpansionSetCode();
}
}

View file

@ -28,7 +28,7 @@
package mage.view;
import mage.Constants.Zone;
import mage.constants.Zone;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
@ -39,7 +39,6 @@ import mage.game.permanent.Permanent;
import mage.target.targetpointer.TargetPointer;
import java.util.*;
import static mage.Constants.Zone.STACK;
/**
*

View file

@ -28,12 +28,12 @@
package mage.view;
import mage.Constants;
import mage.Constants.PhaseStep;
import mage.Constants.TurnPhase;
import mage.constants.PhaseStep;
import mage.constants.TurnPhase;
import mage.MageObject;
import mage.abilities.costs.Cost;
import mage.cards.Card;
import mage.constants.Zone;
import mage.game.ExileZone;
import mage.game.Game;
import mage.game.GameState;
@ -176,7 +176,7 @@ public class GameView implements Serializable {
}
Permanent permanent = game.getPermanent(card.getId());
if (permanent == null) {
permanent = (Permanent)game.getLastKnownInformation(card.getId(), Constants.Zone.BATTLEFIELD);
permanent = (Permanent)game.getLastKnownInformation(card.getId(), Zone.BATTLEFIELD);
}
if (permanent != null) {
if (permanent.isTransformed()) {

View file

@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import mage.Constants.TableState;
import mage.constants.TableState;
import mage.game.Game;
import mage.game.Seat;
import mage.game.Table;