Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge branch 'constants-refactor'

Browse source
This commit is contained in:
North 2013-06-16 15:25:35 +03:00
commit 1d4b3a2be6
7381 changed files with 28780 additions and 27680 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -34,7 +34,7 @@
package mage.client.deckeditor;
import mage.Constants.CardType;
import mage.constants.CardType;
import mage.MageObject;
import mage.ObjectColor;
import mage.cards.Card;

3
Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
View file

@ -45,6 +45,7 @@ import mage.client.util.Config;
import mage.client.util.ImageHelper;
import mage.client.util.sets.ConstructedFormats;
import mage.components.ImagePanel;
import mage.constants.Rarity;
import mage.view.CardView;
import org.apache.log4j.Logger;
import org.mage.card.arcane.GlowText;
@ -254,7 +255,7 @@ public class MageBook extends JComponent {
cardImg.update(card);
cardImg.setCardBounds(rectangle.x, rectangle.y, cardDimensions.frameWidth, cardDimensions.frameHeight);
boolean implemented = !card.getRarity().equals(mage.Constants.Rarity.NA);
boolean implemented = !card.getRarity().equals(Rarity.NA);
GlowText label = new GlowText();
label.setGlow(implemented ? Color.green : NOT_IMPLEMENTED, 12, 0.0f);

2
Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
View file

@ -28,7 +28,7 @@
package mage.client.deckeditor.table;
import mage.Constants.CardType;
import mage.constants.CardType;
import mage.cards.MageCard;
import mage.view.CardView;

6
Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
View file

@ -28,7 +28,6 @@
package mage.client.deckeditor.table;
import mage.Constants;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.cards.CardEventSource;
@ -40,6 +39,7 @@ import mage.client.util.Event;
import mage.client.util.ImageHelper;
import mage.client.util.Listener;
import mage.client.util.gui.GuiDisplayUtil;
import mage.constants.CardType;
import mage.view.CardView;
import mage.view.CardsView;
import org.apache.log4j.Logger;
@ -93,9 +93,9 @@ public class TableModel extends AbstractTableModel implements ICardGrid {
addCard(card, bigCard, gameId);
}
if (updateCountsCallback != null) {
if (card.getCardTypes().contains(Constants.CardType.LAND))
if (card.getCardTypes().contains(CardType.LAND))
landCount++;
if (card.getCardTypes().contains(Constants.CardType.CREATURE))
if (card.getCardTypes().contains(CardType.CREATURE))
creatureCount++;
}
}