Checkstyle-changes for mtg-data.txt parser

This commit is contained in:
Maxmtg
2011-09-12 15:38:05 +00:00
parent 69a95707c6
commit 115afda511

View File

@@ -6,6 +6,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import forge.FileUtil;
@@ -13,6 +14,7 @@ import forge.card.CardManaCost.ManaParser;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
/** This class can read CardRules from Arch's mtg-data.txt file */
public final class MtgDataParser implements Iterator<CardRules> {
private Iterator<String> it;
@@ -77,8 +79,6 @@ public final class MtgDataParser implements Iterator<CardRules> {
@Override
public boolean hasNext() { return weHaveNext; }
private static final String[] emptyArray = new String[0]; // list.toArray() needs this =(
@Override
public CardRules next() {
if (!it.hasNext()) { weHaveNext = false; return null; }
@@ -118,9 +118,8 @@ public final class MtgDataParser implements Iterator<CardRules> {
if (sets.isEmpty()) { return null; } // that was a bad card - it won't be added by invoker
return new CardRules(name, type, cost, ptOrLoyalty, strs.toArray(emptyArray), sets,
// TODO: fix last two parameters
false, false);
return new CardRules(name, type, cost, ptOrLoyalty,
strs.toArray(ArrayUtils.EMPTY_STRING_ARRAY), sets, false, false);
}
private Map<String, CardInSet> getValidEditions(final String sets, final boolean isBasicLand) {
@@ -162,24 +161,23 @@ public final class MtgDataParser implements Iterator<CardRules> {
@Override public void remove() { }
public static class ManaParserMtgData implements ManaParser {
/** This is a mana-parser for mana written in curly braces like {2}{R}{B} */
public static final class ManaParserMtgData implements ManaParser {
private final String cost;
private int nextBracket;
private int colorlessCost;
public ManaParserMtgData(final String cost) {
this.cost = cost;
public ManaParserMtgData(final String cost0) {
this.cost = cost0;
// System.out.println(cost);
nextBracket = cost.indexOf('{');
nextBracket = cost0.indexOf('{');
colorlessCost = 0;
}
public int getTotalColorlessCost() {
if ( hasNext() ) {
if (hasNext()) {
throw new RuntimeException("Colorless cost should be obtained after iteration is complete");
}
return colorlessCost;
@@ -220,6 +218,4 @@ public final class MtgDataParser implements Iterator<CardRules> {
@Override
public void remove() { } // unsuported
}
}