From fb358aebfd771c876d409dcf598314cdf17fa617 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 15 May 2012 19:38:17 +0000 Subject: [PATCH] remove warnings, removed manaparser --- .gitattributes | 1 - src/main/java/forge/StaticEffects.java | 1 - .../forge/card/CardnameTxtManaCostParser.java | 108 ------------------ .../cardfactory/CardFactoryCreatures.java | 1 - .../cardfactory/CardFactoryEquipment.java | 1 - src/main/java/forge/game/GameNew.java | 1 - src/main/java/forge/game/player/AIPlayer.java | 1 - src/main/java/forge/view/arcane/PlayArea.java | 4 +- 8 files changed, 2 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/forge/card/CardnameTxtManaCostParser.java diff --git a/.gitattributes b/.gitattributes index 13509275874..5f12467a1b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11656,7 +11656,6 @@ src/main/java/forge/card/CardRules.java -text src/main/java/forge/card/CardRulesReader.java svneol=native#text/plain src/main/java/forge/card/CardSuperType.java -text src/main/java/forge/card/CardType.java -text -src/main/java/forge/card/CardnameTxtManaCostParser.java -text src/main/java/forge/card/EditionCollection.java svneol=native#text/plain src/main/java/forge/card/EditionInfo.java svneol=native#text/plain src/main/java/forge/card/FatPackData.java -text diff --git a/src/main/java/forge/StaticEffects.java b/src/main/java/forge/StaticEffects.java index 78b7aafafdb..c979ab0f19e 100644 --- a/src/main/java/forge/StaticEffects.java +++ b/src/main/java/forge/StaticEffects.java @@ -23,7 +23,6 @@ import java.util.HashMap; import com.esotericsoftware.minlog.Log; -import forge.card.cardfactory.CardFactoryUtil; import forge.card.replacement.ReplacementEffect; import forge.card.spellability.SpellAbility; import forge.card.staticability.StaticAbility; diff --git a/src/main/java/forge/card/CardnameTxtManaCostParser.java b/src/main/java/forge/card/CardnameTxtManaCostParser.java deleted file mode 100644 index 1d4d53c4a96..00000000000 --- a/src/main/java/forge/card/CardnameTxtManaCostParser.java +++ /dev/null @@ -1,108 +0,0 @@ -package forge.card; - -import org.apache.commons.lang3.StringUtils; - -import forge.card.CardManaCost.ManaParser; - -/** - * The Class ParserCardnameTxtManaCost. - */ -public class CardnameTxtManaCostParser implements ManaParser { - private final String[] cost; - private int nextToken; - private int colorlessCost; - - /** - * Instantiates a new parser cardname txt mana cost. - * - * @param cost - * the cost - */ - public CardnameTxtManaCostParser(final String cost) { - this.cost = cost.split(" "); - // System.out.println(cost); - this.nextToken = 0; - this.colorlessCost = 0; - } - - /* - * (non-Javadoc) - * - * @see forge.card.CardManaCost.ManaParser#getTotalColorlessCost() - */ - @Override - public final int getTotalColorlessCost() { - if (this.hasNext()) { - throw new RuntimeException("Colorless cost should be obtained after iteration is complete"); - } - return this.colorlessCost; - } - - /* - * (non-Javadoc) - * - * @see java.util.Iterator#hasNext() - */ - @Override - public final boolean hasNext() { - return this.nextToken < this.cost.length; - } - - /* - * (non-Javadoc) - * - * @see java.util.Iterator#next() - */ - @Override - public final CardManaCostShard next() { - - final String unparsed = this.cost[this.nextToken++]; - // System.out.println(unparsed); - if (StringUtils.isNumeric(unparsed)) { - this.colorlessCost += Integer.parseInt(unparsed); - return null; - } - - int atoms = 0; - for (int iChar = 0; iChar < unparsed.length(); iChar++) { - switch (unparsed.charAt(iChar)) { - case 'W': - atoms |= CardManaCostShard.Atom.WHITE; - break; - case 'U': - atoms |= CardManaCostShard.Atom.BLUE; - break; - case 'B': - atoms |= CardManaCostShard.Atom.BLACK; - break; - case 'R': - atoms |= CardManaCostShard.Atom.RED; - break; - case 'G': - atoms |= CardManaCostShard.Atom.GREEN; - break; - case '2': - atoms |= CardManaCostShard.Atom.OR_2_COLORLESS; - break; - case 'P': - atoms |= CardManaCostShard.Atom.OR_2_LIFE; - break; - case 'X': - atoms |= CardManaCostShard.Atom.IS_X; - break; - default: - break; - } - } - return CardManaCostShard.valueOf(atoms); - } - - /* - * (non-Javadoc) - * - * @see java.util.Iterator#remove() - */ - @Override - public void remove() { - } // unsuported -} diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index fc93b750f07..caf7fed4bc7 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -35,7 +35,6 @@ import forge.CardUtil; import forge.Command; import forge.Constant; import forge.Counters; -import forge.GameActionUtil; import forge.Singletons; import forge.card.abilityfactory.AbilityFactory; import forge.card.cost.Cost; diff --git a/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java index 80d3f9aa750..cb908d9232f 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java @@ -20,7 +20,6 @@ package forge.card.cardfactory; import java.util.ArrayList; import forge.Card; -import forge.CardList; import forge.Counters; import forge.card.cost.Cost; import forge.card.spellability.Ability; diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index 84bfe6bd8c4..69ad820af9d 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -20,7 +20,6 @@ import forge.card.trigger.TriggerType; import forge.control.FControl; import forge.control.input.InputMulligan; import forge.deck.Deck; -import forge.game.phase.PhaseHandler; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.match.CMatchUI; diff --git a/src/main/java/forge/game/player/AIPlayer.java b/src/main/java/forge/game/player/AIPlayer.java index abbdacfb89b..20c50e65231 100644 --- a/src/main/java/forge/game/player/AIPlayer.java +++ b/src/main/java/forge/game/player/AIPlayer.java @@ -24,7 +24,6 @@ import forge.Card; import forge.CardList; import forge.CardListFilter; import forge.CardListUtil; -import forge.CardUtil; import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; diff --git a/src/main/java/forge/view/arcane/PlayArea.java b/src/main/java/forge/view/arcane/PlayArea.java index 24b1e9e706a..0c609e508c7 100644 --- a/src/main/java/forge/view/arcane/PlayArea.java +++ b/src/main/java/forge/view/arcane/PlayArea.java @@ -395,10 +395,10 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen private void fillRow(final CardStackRow sourceRow, final List rows, final CardStackRow row) { int rowWidth = row.getWidth(); - final Iterator itr = sourceRow.iterator(); + final Iterator itr = sourceRow.iterator(); while (itr.hasNext()) { - final CardStack stack = (CardStack) itr.next(); + final CardStack stack = itr.next(); rowWidth += stack.getWidth(); if (rowWidth > this.playAreaWidth) {