From cc8b14cdecdf4959afcaf274b23366f6892414c9 Mon Sep 17 00:00:00 2001 From: jendave Date: Mon, 31 Oct 2011 14:41:20 +0000 Subject: [PATCH] checkstyle --- src/main/java/forge/card/mana/Mana.java | 56 ++-- src/main/java/forge/card/mana/ManaCost.java | 182 ++++++----- src/main/java/forge/card/mana/ManaPool.java | 308 +++++++++--------- .../java/forge/card/mana/Mana_PartColor.java | 42 ++- .../forge/card/mana/Mana_PartColorless.java | 36 +- .../forge/card/mana/Mana_PartPhyrexian.java | 38 ++- .../java/forge/card/mana/Mana_PartSnow.java | 15 +- .../java/forge/card/mana/Mana_PartSplit.java | 57 ++-- .../java/forge/card/mana/package-info.java | 1 + 9 files changed, 377 insertions(+), 358 deletions(-) diff --git a/src/main/java/forge/card/mana/Mana.java b/src/main/java/forge/card/mana/Mana.java index 617161e459d..f46f07f4ea2 100644 --- a/src/main/java/forge/card/mana/Mana.java +++ b/src/main/java/forge/card/mana/Mana.java @@ -30,13 +30,13 @@ public class Mana { * a {@link forge.Card} object. */ public Mana(final String col, final int amt, final Card source) { - color = col; - amount = amt; + this.color = col; + this.amount = amt; if (source == null) { return; } - sourceCard = source; + this.sourceCard = source; } /** @@ -46,17 +46,18 @@ public class Mana { * * @return a {@link java.lang.String} object. */ + @Override public final String toString() { - if (color.equals(Constant.Color.COLORLESS)) { - return Integer.toString(amount); + if (this.color.equals(Constant.Color.COLORLESS)) { + return Integer.toString(this.amount); } String manaString = ""; - StringBuilder sbMana = new StringBuilder(); + final StringBuilder sbMana = new StringBuilder(); - manaString = Input_PayManaCostUtil.getShortColorString(color); + manaString = Input_PayManaCostUtil.getShortColorString(this.color); - for (int i = 0; i < amount; i++) { + for (int i = 0; i < this.amount; i++) { sbMana.append(manaString); } return sbMana.toString(); @@ -71,25 +72,25 @@ public class Mana { */ public final String toDescriptiveString() { // this will be used for advanced choice box - if (color.equals(Constant.Color.COLORLESS)) { - return Integer.toString(amount); + if (this.color.equals(Constant.Color.COLORLESS)) { + return Integer.toString(this.amount); } String manaString = ""; - StringBuilder sbMana = new StringBuilder(); + final StringBuilder sbMana = new StringBuilder(); - manaString = Input_PayManaCostUtil.getShortColorString(color); + manaString = Input_PayManaCostUtil.getShortColorString(this.color); - for (int i = 0; i < amount; i++) { + for (int i = 0; i < this.amount; i++) { sbMana.append(manaString); } - if (isSnow()) { + if (this.isSnow()) { sbMana.append("(S)"); } sbMana.append(" From "); - sbMana.append(sourceCard.getName()); + sbMana.append(this.sourceCard.getName()); return sbMana.toString(); } @@ -102,7 +103,7 @@ public class Mana { * @return an array of {@link forge.card.mana.Mana} objects. */ public final Mana[] toSingleArray() { - Mana[] normalize = new Mana[amount]; + final Mana[] normalize = new Mana[this.amount]; for (int i = 0; i < normalize.length; i++) { normalize[i] = new Mana(this.color, 1, this.sourceCard); } @@ -117,7 +118,7 @@ public class Mana { * @return a boolean. */ public final boolean isSnow() { - return sourceCard.isSnow(); + return this.sourceCard.isSnow(); } /** @@ -128,7 +129,7 @@ public class Mana { * @return a boolean. */ public final boolean fromBasicLand() { - return sourceCard.isBasicLand(); + return this.sourceCard.isBasicLand(); } // for Imperiosaur /** @@ -139,7 +140,7 @@ public class Mana { * @return a int. */ public final int getColorlessAmount() { - return color.equals(Constant.Color.COLORLESS) ? amount : 0; + return this.color.equals(Constant.Color.COLORLESS) ? this.amount : 0; } /** @@ -150,7 +151,7 @@ public class Mana { * @return a int. */ public final int getAmount() { - return amount; + return this.amount; } /** @@ -163,7 +164,7 @@ public class Mana { * @return a boolean. */ public final boolean isColor(final String col) { - return color.equals(col); + return this.color.equals(col); } /** @@ -176,10 +177,11 @@ public class Mana { * @return a boolean. */ public final boolean isColor(final String[] colors) { - for (String col : colors) - if (color.equals(col)) { + for (final String col : colors) { + if (this.color.equals(col)) { return true; } + } return false; } @@ -192,7 +194,7 @@ public class Mana { * @return a {@link java.lang.String} object. */ public final String getColor() { - return color; + return this.color; } /** @@ -203,7 +205,7 @@ public class Mana { * @return a {@link forge.Card} object. */ public final Card getSourceCard() { - return sourceCard; + return this.sourceCard; } /** @@ -216,7 +218,7 @@ public class Mana { * @return a boolean. */ public final boolean fromSourceCard(final Card c) { - return sourceCard.equals(c); + return this.sourceCard.equals(c); } /** @@ -225,6 +227,6 @@ public class Mana { *

*/ public final void decrementAmount() { - amount--; + this.amount--; } } diff --git a/src/main/java/forge/card/mana/ManaCost.java b/src/main/java/forge/card/mana/ManaCost.java index 6aacf7f38d5..afbf9c6ff18 100644 --- a/src/main/java/forge/card/mana/ManaCost.java +++ b/src/main/java/forge/card/mana/ManaCost.java @@ -19,11 +19,11 @@ import forge.gui.input.Input_PayManaCostUtil; public class ManaCost { // holds Mana_Part objects // ManaPartColor is stored before ManaPartColorless - private ArrayList manaPart; - private HashMap sunburstMap = new HashMap(); + private final ArrayList manaPart; + private final HashMap sunburstMap = new HashMap(); private int xcounter = 0; - private ArrayList manaNeededToAvoidNegativeEffect = new ArrayList(); - private ArrayList manaPaidToAvoidNegativeEffect = new ArrayList(); + private final ArrayList manaNeededToAvoidNegativeEffect = new ArrayList(); + private final ArrayList manaPaidToAvoidNegativeEffect = new ArrayList(); // manaCost can be like "0", "3", "G", "GW", "10", "3 GW", "10 GW" // or "split hybrid mana" like "2/G 2/G", "2/B 2/B 2/B" @@ -48,9 +48,9 @@ public class ManaCost { } else { manaCost = manaCost.replaceFirst("X ", ""); } - setXcounter(getXcounter() + 1); + this.setXcounter(this.getXcounter() + 1); } - manaPart = split(manaCost); + this.manaPart = this.split(manaCost); } /** @@ -61,8 +61,8 @@ public class ManaCost { * @return a int. */ public final int getSunburst() { - int ret = sunburstMap.size(); - sunburstMap.clear(); + final int ret = this.sunburstMap.size(); + this.sunburstMap.clear(); return ret; } @@ -75,7 +75,7 @@ public class ManaCost { */ public final String getColorsPaid() { String s = ""; - for (String key : sunburstMap.keySet()) { + for (final String key : this.sunburstMap.keySet()) { if (key.equalsIgnoreCase("black") || key.equalsIgnoreCase("B")) { s += "B"; } @@ -103,10 +103,10 @@ public class ManaCost { * @return a {@link java.util.ArrayList} object. */ private ArrayList getUnpaidPhyrexianMana() { - ArrayList res = new ArrayList(); - for (Object o : manaPart) { + final ArrayList res = new ArrayList(); + for (final Object o : this.manaPart) { if (o instanceof Mana_PartPhyrexian) { - Mana_PartPhyrexian phy = (Mana_PartPhyrexian) o; + final Mana_PartPhyrexian phy = (Mana_PartPhyrexian) o; if (!phy.isPaid()) { res.add(phy); @@ -125,7 +125,7 @@ public class ManaCost { * @return a boolean. */ public final boolean containsPhyrexianMana() { - for (Object o : manaPart) { + for (final Object o : this.manaPart) { if (o instanceof Mana_PartPhyrexian) { return true; } @@ -142,10 +142,10 @@ public class ManaCost { * @return a boolean. */ public final boolean payPhyrexian() { - ArrayList Phy = getUnpaidPhyrexianMana(); + final ArrayList phy = this.getUnpaidPhyrexianMana(); - if (Phy.size() > 0) { - Phy.get(0).payLife(); + if (phy.size() > 0) { + phy.get(0).payLife(); return true; } @@ -165,7 +165,7 @@ public class ManaCost { * @return a boolean. */ public final boolean isColor(final String color) { - for (Object s : manaPart) { + for (final Object s : this.manaPart) { if (s.toString().contains(color)) { return true; } @@ -185,10 +185,10 @@ public class ManaCost { * @return a boolean. */ public final boolean isNeeded(String mana) { - if (manaNeededToAvoidNegativeEffect.size() != 0) { - for (String s : manaNeededToAvoidNegativeEffect) { + if (this.manaNeededToAvoidNegativeEffect.size() != 0) { + for (final String s : this.manaNeededToAvoidNegativeEffect) { if ((s.equalsIgnoreCase(mana) || s.substring(0, 1).equalsIgnoreCase(mana)) - && !manaPaidToAvoidNegativeEffect.contains(mana)) { + && !this.manaPaidToAvoidNegativeEffect.contains(mana)) { return true; } } @@ -197,8 +197,8 @@ public class ManaCost { mana = Input_PayManaCostUtil.getShortColorString(mana); } Mana_Part m; - for (int i = 0; i < manaPart.size(); i++) { - m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + m = (Mana_Part) this.manaPart.get(i); if (m.isNeeded(mana)) { return true; } @@ -217,12 +217,12 @@ public class ManaCost { */ public final boolean isNeeded(final Mana mana) { Mana_Part m; - for (int i = 0; i < manaPart.size(); i++) { - m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + m = (Mana_Part) this.manaPart.get(i); if (m.isNeeded(mana)) { return true; } - if (m instanceof Mana_PartSnow && mana.isSnow()) { + if ((m instanceof Mana_PartSnow) && mana.isSnow()) { return true; } } @@ -238,14 +238,14 @@ public class ManaCost { */ public final boolean isPaid() { Mana_Part m; - for (int i = 0; i < manaPart.size(); i++) { - m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + m = (Mana_Part) this.manaPart.get(i); if (!m.isPaid()) { return false; } } return true; - }// isPaid() + } // isPaid() /** *

@@ -257,7 +257,7 @@ public class ManaCost { * @return a boolean. */ public final boolean payMana(final Mana mana) { - return addMana(mana); + return this.addMana(mana); } /** @@ -270,11 +270,11 @@ public class ManaCost { * @return a boolean. */ public final boolean payMana(String color) { - if (manaNeededToAvoidNegativeEffect.contains(color) && !manaPaidToAvoidNegativeEffect.contains(color)) { - manaPaidToAvoidNegativeEffect.add(color); + if (this.manaNeededToAvoidNegativeEffect.contains(color) && !this.manaPaidToAvoidNegativeEffect.contains(color)) { + this.manaPaidToAvoidNegativeEffect.add(color); } color = Input_PayManaCostUtil.getShortColorString(color); - return addMana(color); + return this.addMana(color); } /** @@ -291,14 +291,14 @@ public class ManaCost { } Mana_Part m; - for (int i = 0; i < manaPart.size(); i++) { - m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + m = (Mana_Part) this.manaPart.get(i); if (m instanceof Mana_PartColorless) { ((Mana_PartColorless) m).addToManaNeeded(manaToAdd); return; } } - manaPart.add(new Mana_PartColorless(manaToAdd)); + this.manaPart.add(new Mana_PartColorless(manaToAdd)); } /** @@ -317,16 +317,16 @@ public class ManaCost { } Mana_Part m; - for (int i = 0; i < manaPart.size(); i++) { - m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + m = (Mana_Part) this.manaPart.get(i); if (m instanceof Mana_PartColorless) { - int remainingColorless = ((Mana_PartColorless) m).getManaNeeded() - manaToSubtract; + final int remainingColorless = ((Mana_PartColorless) m).getManaNeeded() - manaToSubtract; if (remainingColorless <= 0) { - manaPart.remove(m); + this.manaPart.remove(m); break; } else { - manaPart.remove(m); - manaPart.add(new Mana_PartColorless(remainingColorless)); + this.manaPart.remove(m); + this.manaPart.add(new Mana_PartColorless(remainingColorless)); } } } @@ -342,7 +342,7 @@ public class ManaCost { * @return an int. */ public final int getColorlessManaAmount() { - for (Object m : manaPart) { + for (final Object m : this.manaPart) { if (m instanceof Mana_PartColorless) { return ((Mana_PartColorless) m).getManaNeeded(); } @@ -360,14 +360,14 @@ public class ManaCost { * @return a boolean. */ public final boolean addMana(final String mana) { - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana); } Mana_Part choice = null; - for (int i = 0; i < manaPart.size(); i++) { - Mana_Part m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + final Mana_Part m = (Mana_Part) this.manaPart.get(i); if (m.isNeeded(mana)) { // if m is a better to pay than choice if (choice == null) { @@ -378,17 +378,17 @@ public class ManaCost { choice = m; } } - }// for + } // for if (choice == null) { return false; } choice.reduce(mana); if (!mana.equals(Constant.Color.COLORLESS)) { - if (sunburstMap.containsKey(mana)) { - sunburstMap.put(mana, sunburstMap.get(mana) + 1); + if (this.sunburstMap.containsKey(mana)) { + this.sunburstMap.put(mana, this.sunburstMap.get(mana) + 1); } else { - sunburstMap.put(mana, 1); + this.sunburstMap.put(mana, 1); } } return true; @@ -404,14 +404,14 @@ public class ManaCost { * @return a boolean. */ public final boolean addMana(final Mana mana) { - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana); } Mana_Part choice = null; - for (int i = 0; i < manaPart.size(); i++) { - Mana_Part m = (Mana_Part) manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + final Mana_Part m = (Mana_Part) this.manaPart.get(i); if (m.isNeeded(mana)) { // if m is a better to pay than choice if (choice == null) { @@ -422,17 +422,17 @@ public class ManaCost { choice = m; } } - }// for + } // for if (choice == null) { return false; } choice.reduce(mana); if (!mana.isColor(Constant.Color.COLORLESS)) { - if (sunburstMap.containsKey(mana.getColor())) { - sunburstMap.put(mana.getColor(), sunburstMap.get(mana.getColor()) + 1); + if (this.sunburstMap.containsKey(mana.getColor())) { + this.sunburstMap.put(mana.getColor(), this.sunburstMap.get(mana.getColor()) + 1); } else { - sunburstMap.put(mana.getColor(), 1); + this.sunburstMap.put(mana.getColor(), 1); } } return true; @@ -447,21 +447,21 @@ public class ManaCost { * a {@link java.lang.String} object. */ public final void combineManaCost(final String extra) { - ArrayList extraParts = split(extra); + final ArrayList extraParts = this.split(extra); Mana_PartColorless part = null; - for (int i = 0; i < manaPart.size(); i++) { - Object o = manaPart.get(i); + for (int i = 0; i < this.manaPart.size(); i++) { + final Object o = this.manaPart.get(i); if (o instanceof Mana_PartColorless) { part = (Mana_PartColorless) o; } } if (part != null) { - manaPart.remove(part); + this.manaPart.remove(part); } while (extraParts.size() > 0) { - Object o = extraParts.get(0); + final Object o = extraParts.get(0); if (o instanceof Mana_PartColorless) { if (part == null) { part = (Mana_PartColorless) o; @@ -469,24 +469,30 @@ public class ManaCost { part.addToManaNeeded(((Mana_PartColorless) o).getManaNeeded()); } } else { - manaPart.add(o); + this.manaPart.add(o); } extraParts.remove(o); } if (part != null) { - manaPart.add(part); + this.manaPart.add(part); } } - public final String toString(boolean addX){ - // Boolean addX used to add Xs into the returned value - StringBuilder sb = new StringBuilder(); - ArrayList list = new ArrayList(manaPart); + /** + * To string. + * + * @param addX the add x + * @return the string + */ + public final String toString(final boolean addX) { + // Boolean addX used to add Xs into the returned value + final StringBuilder sb = new StringBuilder(); + final ArrayList list = new ArrayList(this.manaPart); // need to reverse everything since the colored mana is stored first Collections.reverse(list); if (addX) { - for (int i = 0; i < getXcounter(); i++) { + for (int i = 0; i < this.getXcounter(); i++) { sb.append("X").append(" "); } } @@ -495,7 +501,7 @@ public class ManaCost { sb.append(list.get(i).toString()).append(" "); } - String str = sb.toString().trim(); + final String str = sb.toString().trim(); if (str.equals("")) { return "0"; @@ -507,7 +513,7 @@ public class ManaCost { /** {@inheritDoc} */ @Override public final String toString() { - return toString(true); + return this.toString(true); } /** @@ -519,7 +525,7 @@ public class ManaCost { */ public final int getConvertedManaCost() { int cmc = 0; - for (Object s : manaPart) { + for (final Object s : this.manaPart) { cmc += ((Mana_Part) s).getConvertedManaCost(); } return cmc; @@ -535,14 +541,14 @@ public class ManaCost { */ public final double getWeightedManaCost() { double cmc = 0; - for (Object s : manaPart) { + for (final Object s : this.manaPart) { cmc += ((Mana_Part) s).getConvertedManaCost(); if (s instanceof Mana_PartColor) { cmc += 0.0001; } } - cmc += 0.00001 * getXcounter(); + cmc += 0.00001 * this.getXcounter(); return cmc; } @@ -556,10 +562,10 @@ public class ManaCost { * @return a {@link java.util.ArrayList} object. */ private ArrayList split(final String cost) { - ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList(); // handles costs like "3", "G", "GW", "10", "S" - if (cost.length() == 1 || cost.length() == 2) { + if ((cost.length() == 1) || (cost.length() == 2)) { if (Character.isDigit(cost.charAt(0))) { list.add(new Mana_PartColorless(cost)); } else if (cost.charAt(0) == 'S') { @@ -569,13 +575,13 @@ public class ManaCost { } else { list.add(new Mana_PartColor(cost)); } - } else// handles "3 GW", "10 GW", "1 G G", "G G", "S 1" - { + } else { + // handles "3 GW", "10 GW", "1 G G", "G G", "S 1" // all costs that have a length greater than 2 have a space - StringTokenizer tok = new StringTokenizer(cost); + final StringTokenizer tok = new StringTokenizer(cost); while (tok.hasMoreTokens()) { - list.add(getManaPart(tok.nextToken())); + list.add(this.getManaPart(tok.nextToken())); } // ManaPartColorless needs to be added AFTER the colored mana @@ -593,10 +599,10 @@ public class ManaCost { list.remove(0); list.add(o); } - }// else + } // else return list; - }// split() + } // split() /** *

@@ -641,7 +647,7 @@ public class ManaCost { * @return a int. */ public final int getXcounter() { - return xcounter; + return this.xcounter; } /** @@ -653,9 +659,9 @@ public class ManaCost { */ public final void removeColorlessMana() { - for (int i = 0; i < manaPart.size(); i++) { - if (manaPart.get(i) instanceof Mana_PartColorless) { - manaPart.remove(manaPart.get(i)); + for (int i = 0; i < this.manaPart.size(); i++) { + if (this.manaPart.get(i) instanceof Mana_PartColorless) { + this.manaPart.remove(this.manaPart.get(i)); } } } @@ -667,8 +673,8 @@ public class ManaCost { * the new mana needed to avoid negative effect */ public final void setManaNeededToAvoidNegativeEffect(final String[] manaCol) { - for (String s : manaCol) { - manaNeededToAvoidNegativeEffect.add(s); + for (final String s : manaCol) { + this.manaNeededToAvoidNegativeEffect.add(s); } } @@ -678,6 +684,6 @@ public class ManaCost { * @return the mana needed to avoid negative effect */ public final ArrayList getManaNeededToAvoidNegativeEffect() { - return manaNeededToAvoidNegativeEffect; + return this.manaNeededToAvoidNegativeEffect; } } diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java index bca6c2c2965..2fb0dad9cd3 100644 --- a/src/main/java/forge/card/mana/ManaPool.java +++ b/src/main/java/forge/card/mana/ManaPool.java @@ -26,8 +26,8 @@ import forge.gui.input.Input_PayManaCostUtil; public class ManaPool extends Card { // current paying moved to SpellAbility - private ArrayList floatingMana = new ArrayList(); - private int[] floatingTotals = new int[7]; // WUBRGCS + private final ArrayList floatingMana = new ArrayList(); + private final int[] floatingTotals = new int[7]; // WUBRGCS /** Constant map. */ private static final Map map = new HashMap(); @@ -35,7 +35,7 @@ public class ManaPool extends Card { public static final String colors = "WUBRG"; /** Constant mcolors="1WUBRG". */ public static final String mcolors = "1WUBRG"; - private Player owner; + private final Player owner; /** *

@@ -47,22 +47,22 @@ public class ManaPool extends Card { */ public ManaPool(final Player player) { super(); - updateObservers(); - owner = player; + this.updateObservers(); + this.owner = player; this.clearControllers(); this.addController(player); - setName("Mana Pool"); - addIntrinsicKeyword("Shroud"); - addIntrinsicKeyword("Indestructible"); - setImmutable(true); - clearPool(); - map.put(Constant.Color.WHITE, 0); - map.put(Constant.Color.BLUE, 1); - map.put(Constant.Color.BLACK, 2); - map.put(Constant.Color.RED, 3); - map.put(Constant.Color.GREEN, 4); - map.put(Constant.Color.COLORLESS, 5); - map.put(Constant.Color.SNOW, 6); + this.setName("Mana Pool"); + this.addIntrinsicKeyword("Shroud"); + this.addIntrinsicKeyword("Indestructible"); + this.setImmutable(true); + this.clearPool(); + ManaPool.map.put(Constant.Color.WHITE, 0); + ManaPool.map.put(Constant.Color.BLUE, 1); + ManaPool.map.put(Constant.Color.BLACK, 2); + ManaPool.map.put(Constant.Color.RED, 3); + ManaPool.map.put(Constant.Color.GREEN, 4); + ManaPool.map.put(Constant.Color.COLORLESS, 5); + ManaPool.map.put(Constant.Color.SNOW, 6); } /** @@ -73,24 +73,24 @@ public class ManaPool extends Card { * @return a {@link java.lang.String} object. */ public final String getManaList() { - Mana[] pool = floatingMana.toArray(new Mana[floatingMana.size()]); + final Mana[] pool = this.floatingMana.toArray(new Mana[this.floatingMana.size()]); - int[] normalMana = { 0, 0, 0, 0, 0, 0 }; - int[] snowMana = { 0, 0, 0, 0, 0, 0 }; - String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, Constant.Color.RED, - Constant.Color.GREEN, Constant.Color.COLORLESS }; + final int[] normalMana = { 0, 0, 0, 0, 0, 0 }; + final int[] snowMana = { 0, 0, 0, 0, 0, 0 }; + final String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, + Constant.Color.RED, Constant.Color.GREEN, Constant.Color.COLORLESS }; - for (Mana m : pool) { + for (final Mana m : pool) { if (m.isSnow()) { - snowMana[map.get(m.getColor())] += m.getAmount(); + snowMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } else { - normalMana[map.get(m.getColor())] += m.getAmount(); + normalMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } } - StringBuilder sbNormal = new StringBuilder(""); - StringBuilder sbSnow = new StringBuilder(""); - if (!isEmpty()) { + final StringBuilder sbNormal = new StringBuilder(""); + final StringBuilder sbSnow = new StringBuilder(""); + if (!this.isEmpty()) { for (int i = 0; i < 6; i++) { if (i == 5) { if (normalMana[i] > 0) { @@ -126,24 +126,24 @@ public class ManaPool extends Card { /** {@inheritDoc} */ @Override public final String getText() { - Mana[] pool = floatingMana.toArray(new Mana[floatingMana.size()]); + final Mana[] pool = this.floatingMana.toArray(new Mana[this.floatingMana.size()]); - int[] normalMana = { 0, 0, 0, 0, 0, 0 }; - int[] snowMana = { 0, 0, 0, 0, 0, 0 }; - String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, Constant.Color.RED, - Constant.Color.GREEN, Constant.Color.COLORLESS }; + final int[] normalMana = { 0, 0, 0, 0, 0, 0 }; + final int[] snowMana = { 0, 0, 0, 0, 0, 0 }; + final String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, + Constant.Color.RED, Constant.Color.GREEN, Constant.Color.COLORLESS }; - for (Mana m : pool) { + for (final Mana m : pool) { if (m.isSnow()) { - snowMana[map.get(m.getColor())] += m.getAmount(); + snowMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } else { - normalMana[map.get(m.getColor())] += m.getAmount(); + normalMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } } - StringBuilder sbNormal = new StringBuilder(); - StringBuilder sbSnow = new StringBuilder(); - if (!isEmpty()) { + final StringBuilder sbNormal = new StringBuilder(); + final StringBuilder sbSnow = new StringBuilder(); + if (!this.isEmpty()) { for (int i = 0; i < 6; i++) { if (i == 5) { // Put colorless first @@ -182,7 +182,7 @@ public class ManaPool extends Card { * @return a int. */ public final int getAmountOfColor(final String color) { - return floatingTotals[map.get(color)]; + return this.floatingTotals[ManaPool.map.get(color)]; } /** @@ -195,7 +195,7 @@ public class ManaPool extends Card { * @return a int. */ public final int getAmountOfColor(final char color) { - return getAmountOfColor(Character.toString(color)); + return this.getAmountOfColor(Character.toString(color)); } /** @@ -206,7 +206,7 @@ public class ManaPool extends Card { * @return a boolean. */ public final boolean isEmpty() { - return floatingMana.size() == 0; + return this.floatingMana.size() == 0; } /** @@ -220,10 +220,10 @@ public class ManaPool extends Card { */ public static String oraclize(final String manaCost) { // converts RB to (R/B) - String[] parts = manaCost.split(" "); - StringBuilder res = new StringBuilder(); + final String[] parts = manaCost.split(" "); + final StringBuilder res = new StringBuilder(); for (String s : parts) { - if (s.length() == 2 && colors.contains(s.charAt(1) + "")) { + if ((s.length() == 2) && ManaPool.colors.contains(s.charAt(1) + "")) { s = s.charAt(0) + "/" + s.charAt(1); } if (s.length() == 3) { @@ -252,10 +252,10 @@ public class ManaPool extends Card { */ public final void addManaToPool(final ArrayList pool, final Mana mana) { pool.add(mana); - if (pool.equals(floatingMana)) { - floatingTotals[map.get(mana.getColor())] += mana.getAmount(); + if (pool.equals(this.floatingMana)) { + this.floatingTotals[ManaPool.map.get(mana.getColor())] += mana.getAmount(); if (mana.isSnow()) { - floatingTotals[map.get(Constant.Color.SNOW)] += mana.getAmount(); + this.floatingTotals[ManaPool.map.get(Constant.Color.SNOW)] += mana.getAmount(); } } } @@ -271,9 +271,9 @@ public class ManaPool extends Card { * a {@link forge.Card} object. */ public final void addManaToFloating(final String manaStr, final Card card) { - ArrayList manaList = convertStringToMana(manaStr, card); - for (Mana m : manaList) { - addManaToPool(floatingMana, m); + final ArrayList manaList = ManaPool.convertStringToMana(manaStr, card); + for (final Mana m : manaList) { + this.addManaToPool(this.floatingMana, m); } AllZone.getGameAction().checkStateEffects(); } @@ -290,16 +290,16 @@ public class ManaPool extends Card { * @return a {@link java.util.ArrayList} object. */ public static ArrayList convertStringToMana(String manaStr, final Card card) { - ArrayList manaList = new ArrayList(); + final ArrayList manaList = new ArrayList(); manaStr = manaStr.trim(); - String[] manaArr = manaStr.split(" "); + final String[] manaArr = manaStr.split(" "); String color = ""; int total = 0; int genericTotal = 0; - for (String c : manaArr) { - String longStr = Input_PayManaCostUtil.getLongColorString(c); + for (final String c : manaArr) { + final String longStr = Input_PayManaCostUtil.getLongColorString(c); if (longStr.equals(Constant.Color.COLORLESS)) { genericTotal += Integer.parseInt(c); } else if (color.equals("")) { @@ -331,22 +331,22 @@ public class ManaPool extends Card { *

*/ public final void clearPool() { - if (floatingMana.size() == 0) { + if (this.floatingMana.size() == 0) { return; } - if (AllZoneUtil.isCardInPlay("Omnath, Locus of Mana", owner)) { + if (AllZoneUtil.isCardInPlay("Omnath, Locus of Mana", this.owner)) { // Omnath in play, clear all non-green mana int i = 0; - while (i < floatingMana.size()) { - if (floatingMana.get(i).isColor(Constant.Color.GREEN)) { + while (i < this.floatingMana.size()) { + if (this.floatingMana.get(i).isColor(Constant.Color.GREEN)) { i++; continue; } - floatingMana.remove(i); + this.floatingMana.remove(i); } } else { - floatingMana.clear(); + this.floatingMana.clear(); } } @@ -362,7 +362,7 @@ public class ManaPool extends Card { * @return a {@link forge.card.mana.Mana} object. */ public final Mana getManaFrom(final ArrayList pool, final String manaStr) { - String[] colors = manaStr.split("/"); + final String[] colors = manaStr.split("/"); boolean wantSnow = false; for (int i = 0; i < colors.length; i++) { colors[i] = Input_PayManaCostUtil.getLongColorString(colors[i]); @@ -372,9 +372,9 @@ public class ManaPool extends Card { } Mana choice = null; - ArrayList manaChoices = new ArrayList(); + final ArrayList manaChoices = new ArrayList(); - for (Mana mana : pool) { + for (final Mana mana : pool) { if (mana.isColor(colors)) { if (choice == null) { choice = mana; @@ -391,13 +391,14 @@ public class ManaPool extends Card { // give preference to Colorless Snow mana over Colored snow // mana choice = mana; - } else if (floatingTotals[map.get(mana.getColor())] > floatingTotals[map.get(choice.getColor())]) { + } else if (this.floatingTotals[ManaPool.map.get(mana.getColor())] > this.floatingTotals[ManaPool.map + .get(choice.getColor())]) { // give preference to Colored mana that there is more of to // pay Snow costs choice = mana; } } else if (colors[0].equals(Constant.Color.COLORLESS)) { // colorless - if (choice == null && mana.isColor(Constant.Color.COLORLESS)) { + if ((choice == null) && mana.isColor(Constant.Color.COLORLESS)) { choice = mana; // Colorless fits the bill nicely } else if (choice == null) { manaChoices.add(mana); @@ -416,22 +417,22 @@ public class ManaPool extends Card { if (manaChoices.size() == 1) { choice = manaChoices.get(0); } else if (manaChoices.size() > 1) { - int[] normalMana = { 0, 0, 0, 0, 0, 0 }; - int[] snowMana = { 0, 0, 0, 0, 0, 0 }; - String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, + final int[] normalMana = { 0, 0, 0, 0, 0, 0 }; + final int[] snowMana = { 0, 0, 0, 0, 0, 0 }; + final String[] manaStrings = { Constant.Color.WHITE, Constant.Color.BLUE, Constant.Color.BLACK, Constant.Color.RED, Constant.Color.GREEN, Constant.Color.COLORLESS }; // loop through manaChoices adding - for (Mana m : manaChoices) { + for (final Mana m : manaChoices) { if (m.isSnow()) { - snowMana[map.get(m.getColor())] += m.getAmount(); + snowMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } else { - normalMana[map.get(m.getColor())] += m.getAmount(); + normalMana[ManaPool.map.get(m.getColor())] += m.getAmount(); } } int totalMana = 0; - ArrayList alChoice = new ArrayList(); + final ArrayList alChoice = new ArrayList(); for (int i = 0; i < normalMana.length; i++) { totalMana += normalMana[i]; totalMana += snowMana[i]; @@ -447,10 +448,11 @@ public class ManaPool extends Card { choice = manaChoices.get(0); return choice; } - + int numColorless = 0; - if(manaStr.matches("[0-9][0-9]?")) + if (manaStr.matches("[0-9][0-9]?")) { numColorless = Integer.parseInt(manaStr); + } if (numColorless >= totalMana) { choice = manaChoices.get(0); return choice; @@ -458,7 +460,7 @@ public class ManaPool extends Card { Object o; - if (owner.isHuman()) { + if (this.owner.isHuman()) { o = GuiUtils.getChoiceOptional("Pay Mana from Mana Pool", alChoice.toArray()); } else { o = alChoice.get(0); // owner is computer @@ -466,12 +468,12 @@ public class ManaPool extends Card { if (o != null) { String ch = o.toString(); - boolean grabSnow = ch.startsWith("{S}"); + final boolean grabSnow = ch.startsWith("{S}"); ch = ch.replace("{S}", ""); ch = ch.substring(0, ch.indexOf("(")); - for (Mana m : manaChoices) { + for (final Mana m : manaChoices) { if (m.isColor(ch) && (!grabSnow || (grabSnow && m.isSnow()))) { if (choice == null) { choice = m; @@ -498,7 +500,7 @@ public class ManaPool extends Card { * a {@link forge.Card} object. */ public final void removeManaFromFloating(final ManaCost mc, final Card c) { - removeManaFrom(floatingMana, mc, c); + this.removeManaFrom(this.floatingMana, mc, c); } /** @@ -518,11 +520,11 @@ public class ManaPool extends Card { Mana choice = null; boolean flag = false; while (i < pool.size()) { - Mana mana = pool.get(i); + final Mana mana = pool.get(i); if (flag) { c = this; } - if (c == this && mc.isNeeded(mana)) { + if ((c == this) && mc.isNeeded(mana)) { c = mana.getSourceCard(); flag = true; } @@ -531,7 +533,7 @@ public class ManaPool extends Card { } i++; } - removeManaFrom(pool, choice); + this.removeManaFrom(pool, choice); } /** @@ -546,13 +548,13 @@ public class ManaPool extends Card { */ public final void findAndRemoveFrom(final ArrayList pool, final Mana mana) { Mana set = null; - for (Mana m : pool) { + for (final Mana m : pool) { if (m.getSourceCard().equals(mana.getSourceCard()) && m.getColor().equals(mana.getColor())) { set = m; break; } } - removeManaFrom(pool, set); + this.removeManaFrom(pool, set); } /** @@ -572,10 +574,10 @@ public class ManaPool extends Card { } else { choice.decrementAmount(); } - if (pool.equals(floatingMana)) { - floatingTotals[map.get(choice.getColor())] -= choice.getAmount(); + if (pool.equals(this.floatingMana)) { + this.floatingTotals[ManaPool.map.get(choice.getColor())] -= choice.getAmount(); if (choice.isSnow()) { - floatingTotals[map.get(Constant.Color.SNOW)] -= choice.getAmount(); + this.floatingTotals[ManaPool.map.get(Constant.Color.SNOW)] -= choice.getAmount(); } } } @@ -591,7 +593,7 @@ public class ManaPool extends Card { * @return an array of {@link java.lang.String} objects. */ public static String[] formatMana(final Ability_Mana manaAbility) { - return formatMana(manaAbility.mana(), true); + return ManaPool.formatMana(manaAbility.mana(), true); } // wrapper /** @@ -606,7 +608,7 @@ public class ManaPool extends Card { public static String[] formatMana(final String mana2) { // turns "G G" -> {"G","G"}, "2 UG"->"{"2","U/G"}, "B W U R // G" -> {"B","W","U","R","G"}, etc. - return formatMana(mana2, false); + return ManaPool.formatMana(mana2, false); } /** @@ -627,22 +629,22 @@ public class ManaPool extends Card { return null; } if (!parsed) { - mana = oraclize(mana); + mana = ManaPool.oraclize(mana); } try { - String[] colorless = { Integer.toString(Integer.parseInt(mana)) }; + final String[] colorless = { Integer.toString(Integer.parseInt(mana)) }; return colorless; - } catch (NumberFormatException ex) { + } catch (final NumberFormatException ex) { } - ArrayList res = new ArrayList(); + final ArrayList res = new ArrayList(); int colorless = 0; String clessString = ""; boolean parentheses = false; String current = ""; for (int i = 0; i < mana.length(); i++) { - char c = mana.charAt(i); + final char c = mana.charAt(i); if (c == '(') { parentheses = true; continue; @@ -659,15 +661,15 @@ public class ManaPool extends Card { continue; } } - String s = c + ""; - if (colors.contains(s)) { + final String s = c + ""; + if (ManaPool.colors.contains(s)) { res.add(s); if (clessString.trim().equals("")) { continue; } try { colorless += Integer.parseInt(clessString.trim()); - } catch (NumberFormatException ex) { + } catch (final NumberFormatException ex) { throw new RuntimeException( "Mana_Pool.getManaParts : Error, sum of noncolor mana parts is not a number - " + clessString); @@ -698,24 +700,24 @@ public class ManaPool extends Card { * @return a {@link forge.card.mana.ManaCost} object. */ private ManaCost subtractMultiple(final SpellAbility sa, final String[] cost, ManaCost m) { - for (String s : cost) { - if (isEmpty()) { + for (final String s : cost) { + if (this.isEmpty()) { break; } int num = 1; try { num = Integer.parseInt(s); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { // Not an integer, that's fine } for (int i = 0; i < num; i++) { - if (isEmpty()) { + if (this.isEmpty()) { break; } - m = subtractOne(sa, m, s); + m = this.subtractOne(sa, m, s); } } return m; @@ -735,23 +737,23 @@ public class ManaPool extends Card { * @return a {@link forge.card.mana.ManaCost} object. */ public final ManaCost subtractMana(final SpellAbility sa, ManaCost m, final Ability_Mana... mAbilities) { - ArrayList paidAbs = sa.getPayingManaAbilities(); + final ArrayList paidAbs = sa.getPayingManaAbilities(); if (mAbilities.length == 0) { // paying from Mana Pool - if (m.isPaid() || isEmpty()) { + if (m.isPaid() || this.isEmpty()) { return m; } - String[] cost = formatMana(m.toString()); - return subtractMultiple(sa, cost, m); + final String[] cost = ManaPool.formatMana(m.toString()); + return this.subtractMultiple(sa, cost, m); } // paying via Mana Abilities - for (Ability_Mana mability : mAbilities) { + for (final Ability_Mana mability : mAbilities) { paidAbs.add(mability); - String[] cost = formatMana(mability); - m = subtractMultiple(sa, cost, m); + final String[] cost = ManaPool.formatMana(mability); + m = this.subtractMultiple(sa, cost, m); } return m; @@ -767,24 +769,23 @@ public class ManaPool extends Card { */ public final void subtractOne(final String manaStr) { // Just subtract from floating, used by removeExtrinsicKeyword - ManaCost manaCost = new ManaCost(manaStr); + final ManaCost manaCost = new ManaCost(manaStr); if (manaStr.trim().equals("") || manaCost.isPaid()) { return; } // get a mana of this type from floating, bail if none available - Mana mana = getManaFrom(floatingMana, manaStr); + final Mana mana = this.getManaFrom(this.floatingMana, manaStr); if (mana == null) { return; // no matching mana in the pool } - Mana[] manaArray = mana.toSingleArray(); + final Mana[] manaArray = mana.toSingleArray(); - for (int i = 0; i < manaArray.length; i++) { - Mana m = manaArray[i]; + for (final Mana m : manaArray) { if (manaCost.isNeeded(m)) { manaCost.payMana(m); - findAndRemoveFrom(floatingMana, m); + this.findAndRemoveFrom(this.floatingMana, m); } else { break; } @@ -809,22 +810,21 @@ public class ManaPool extends Card { return manaCost; } - ArrayList payMana = sa.getPayingMana(); + final ArrayList payMana = sa.getPayingMana(); // get a mana of this type from floating, bail if none available - Mana mana = getManaFrom(floatingMana, manaStr); + final Mana mana = this.getManaFrom(this.floatingMana, manaStr); if (mana == null) { return manaCost; // no matching mana in the pool } - Mana[] manaArray = mana.toSingleArray(); + final Mana[] manaArray = mana.toSingleArray(); - for (int i = 0; i < manaArray.length; i++) { - Mana m = manaArray[i]; + for (final Mana m : manaArray) { if (manaCost.isNeeded(m)) { manaCost.payMana(m); payMana.add(m); - findAndRemoveFrom(floatingMana, m); + this.findAndRemoveFrom(this.floatingMana, m); } else { break; } @@ -841,7 +841,7 @@ public class ManaPool extends Card { */ public final int totalMana() { int total = 0; - for (Mana c : floatingMana) { + for (final Mana c : this.floatingMana) { total += c.getAmount(); } return total; @@ -858,14 +858,14 @@ public class ManaPool extends Card { * a boolean. */ public final void clearPay(final SpellAbility ability, final boolean refund) { - ArrayList payAbs = ability.getPayingManaAbilities(); - ArrayList payMana = ability.getPayingMana(); + final ArrayList payAbs = ability.getPayingManaAbilities(); + final ArrayList payMana = ability.getPayingMana(); payAbs.clear(); // move non-undoable paying mana back to floating if (refund) { - for (Mana m : payMana) { - addManaToPool(floatingMana, m); + for (final Mana m : payMana) { + this.addManaToPool(this.floatingMana, m); } } @@ -887,30 +887,30 @@ public class ManaPool extends Card { */ public final boolean accountFor(final SpellAbility sa, final String[] mana, final Card c) { // TODO account for unpaying mana in payMana and floatingPool - ArrayList payMana = sa.getPayingMana(); + final ArrayList payMana = sa.getPayingMana(); - ArrayList removePaying = new ArrayList(); - ArrayList removeFloating = new ArrayList(); + final ArrayList removePaying = new ArrayList(); + final ArrayList removeFloating = new ArrayList(); int i = 0, j = 0; boolean usePay = payMana.size() > 0; - boolean flag = false; + final boolean flag = false; String manaStr = mana[i]; String color = Input_PayManaCostUtil.getLongColorString(manaStr); - if (!usePay && floatingMana.size() == 0) { + if (!usePay && (this.floatingMana.size() == 0)) { return false; } while (i < mana.length) { - Mana m = usePay ? payMana.get(j) : floatingMana.get(j); + final Mana m = usePay ? payMana.get(j) : this.floatingMana.get(j); if (m.fromSourceCard(c) && m.getColor().equals(color)) { - int amt = m.getColorlessAmount(); + final int amt = m.getColorlessAmount(); if (amt > 0) { - int difference = Integer.parseInt(manaStr) - amt; + final int difference = Integer.parseInt(manaStr) - amt; if (difference > 0) { manaStr = Integer.toString(difference); } else { @@ -947,16 +947,16 @@ public class ManaPool extends Card { usePay = false; } } - if (!usePay && floatingMana.size() == j && !flag) { + if (!usePay && (this.floatingMana.size() == j) && !flag) { return false; } } for (int k = 0; k < removePaying.size(); k++) { - removeManaFrom(payMana, removePaying.get(k)); + this.removeManaFrom(payMana, removePaying.get(k)); } for (int k = 0; k < removeFloating.size(); k++) { - removeManaFrom(floatingMana, removeFloating.get(k)); + this.removeManaFrom(this.floatingMana, removeFloating.get(k)); } return true; } @@ -974,13 +974,13 @@ public class ManaPool extends Card { public final void unpaid(final SpellAbility sa, final boolean untap) { // TODO having some crash in here related to undo and not tracking // abilities properly - ArrayList payAbs = sa.getPayingManaAbilities(); + final ArrayList payAbs = sa.getPayingManaAbilities(); // go through paidAbilities if they are undoable - for (Ability_Mana am : payAbs) { + for (final Ability_Mana am : payAbs) { if (am.isUndoable()) { - String[] formattedMana = formatMana(am); - if (accountFor(sa, formattedMana, am.getSourceCard())) { + final String[] formattedMana = ManaPool.formatMana(am); + if (this.accountFor(sa, formattedMana, am.getSourceCard())) { am.undo(); } // else can't account let clearPay move paying back to floating @@ -988,7 +988,7 @@ public class ManaPool extends Card { } // move leftover pay back to floating - clearPay(sa, true); + this.clearPay(sa, true); } /** @@ -997,26 +997,26 @@ public class ManaPool extends Card { *

*/ private void updateKeywords() { - extrinsicKeyword.clear(); - for (Mana m : floatingMana) { - extrinsicKeyword.add("ManaPool:" + m.toString()); + this.extrinsicKeyword.clear(); + for (final Mana m : this.floatingMana) { + this.extrinsicKeyword.add("ManaPool:" + m.toString()); } } - private ArrayList extrinsicKeyword = new ArrayList(); + private final ArrayList extrinsicKeyword = new ArrayList(); /** {@inheritDoc} */ @Override public final ArrayList getExtrinsicKeyword() { - return new ArrayList(extrinsicKeyword); + return new ArrayList(this.extrinsicKeyword); } /** {@inheritDoc} */ @Override public final void addExtrinsicKeyword(final String s) { if (s.startsWith("ManaPool:")) { - extrinsicKeyword.add(s); - addManaToFloating(s.split(":")[1], this); + this.extrinsicKeyword.add(s); + this.addManaToFloating(s.split(":")[1], this); } } @@ -1024,9 +1024,9 @@ public class ManaPool extends Card { @Override public final void removeExtrinsicKeyword(final String s) { if (s.startsWith("ManaPool:")) { - updateKeywords(); - extrinsicKeyword.remove(s); - subtractOne(s.split(":")[1]); + this.updateKeywords(); + this.extrinsicKeyword.remove(s); + this.subtractOne(s.split(":")[1]); this.updateObservers(); } } @@ -1034,7 +1034,7 @@ public class ManaPool extends Card { /** {@inheritDoc} */ @Override public final int getExtrinsicKeywordSize() { - updateKeywords(); - return extrinsicKeyword.size(); + this.updateKeywords(); + return this.extrinsicKeyword.size(); } } diff --git a/src/main/java/forge/card/mana/Mana_PartColor.java b/src/main/java/forge/card/mana/Mana_PartColor.java index 7bc11cf63fe..5f90562db5b 100644 --- a/src/main/java/forge/card/mana/Mana_PartColor.java +++ b/src/main/java/forge/card/mana/Mana_PartColor.java @@ -25,54 +25,52 @@ public class Mana_PartColor extends Mana_Part { * a {@link java.lang.String} object. */ public Mana_PartColor(final String manaCostToPay) { - char[] c = manaCostToPay.toCharArray(); + final char[] c = manaCostToPay.toCharArray(); for (int i = 0; i < c.length; i++) { - if (i == 0 && c[i] == ' ') { - ; - } else { - checkSingleMana("" + c[i]); + if ((i != 0) || (c[i] != ' ')) { + Mana_Part.checkSingleMana("" + c[i]); } } - manaCost = manaCostToPay; + this.manaCost = manaCostToPay; } /** {@inheritDoc} */ @Override public final String toString() { - return manaCost; + return this.manaCost; } /** {@inheritDoc} */ @Override public final boolean isNeeded(final String mana) { // ManaPart method - checkSingleMana(mana); + Mana_Part.checkSingleMana(mana); - return !isPaid() && isColor(mana); + return !this.isPaid() && this.isColor(mana); } /** {@inheritDoc} */ @Override public final boolean isNeeded(final Mana mana) { - return (!isPaid() && isColor(mana)); + return (!this.isPaid() && this.isColor(mana)); } /** {@inheritDoc} */ @Override public final boolean isColor(final String mana) { // ManaPart method - checkSingleMana(mana); + Mana_Part.checkSingleMana(mana); - return manaCost.indexOf(mana) != -1; + return this.manaCost.indexOf(mana) != -1; } /** {@inheritDoc} */ @Override public final boolean isColor(final Mana mana) { - String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); + final String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); - return manaCost.indexOf(color) != -1; + return this.manaCost.indexOf(color) != -1; } /** {@inheritDoc} */ @@ -81,37 +79,37 @@ public class Mana_PartColor extends Mana_Part { if (mp instanceof Mana_PartColorless) { return false; } - return toString().length() >= mp.toString().length(); + return this.toString().length() >= mp.toString().length(); } /** {@inheritDoc} */ @Override public final void reduce(final String mana) { // if mana is needed, then this mana cost is all paid up - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("Mana_PartColor : reduce() error, argument mana not needed, mana - " + mana - + ", toString() - " + toString()); + + ", toString() - " + this.toString()); } - manaCost = ""; + this.manaCost = ""; } /** {@inheritDoc} */ @Override public final void reduce(final Mana mana) { // if mana is needed, then this mana cost is all paid up - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("Mana_PartColor : reduce() error, argument mana not needed, mana - " + mana - + ", toString() - " + toString()); + + ", toString() - " + this.toString()); } - manaCost = ""; + this.manaCost = ""; } /** {@inheritDoc} */ @Override public final boolean isPaid() { - return manaCost.length() == 0; + return this.manaCost.length() == 0; } /** {@inheritDoc} */ diff --git a/src/main/java/forge/card/mana/Mana_PartColorless.java b/src/main/java/forge/card/mana/Mana_PartColorless.java index aafe7b6651d..baa03457288 100644 --- a/src/main/java/forge/card/mana/Mana_PartColorless.java +++ b/src/main/java/forge/card/mana/Mana_PartColorless.java @@ -22,7 +22,7 @@ public class Mana_PartColorless extends Mana_Part { * a int. */ public final void addToManaNeeded(final int additional) { - manaNeeded += additional; + this.manaNeeded += additional; } /** @@ -33,7 +33,7 @@ public class Mana_PartColorless extends Mana_Part { * @return a int. */ public final int getManaNeeded() { - return manaNeeded; + return this.manaNeeded; } // String manaCostToPay is like "1", "4", but NO COLOR @@ -47,8 +47,8 @@ public class Mana_PartColorless extends Mana_Part { */ public Mana_PartColorless(final String manaCostToPay) { try { - manaNeeded = Integer.parseInt(manaCostToPay); - } catch (NumberFormatException ex) { + this.manaNeeded = Integer.parseInt(manaCostToPay); + } catch (final NumberFormatException ex) { ErrorViewer.showError(ex, "mana cost is not a number - %s", manaCostToPay); throw new RuntimeException(String.format("mana cost is not a number - %s", manaCostToPay), ex); } @@ -63,26 +63,26 @@ public class Mana_PartColorless extends Mana_Part { * a int. */ public Mana_PartColorless(final int manaCostToPay) { - manaNeeded = manaCostToPay; + this.manaNeeded = manaCostToPay; } /** {@inheritDoc} */ @Override public final String toString() { - if (isPaid()) { + if (this.isPaid()) { return ""; } - return String.valueOf(manaNeeded); + return String.valueOf(this.manaNeeded); } /** {@inheritDoc} */ @Override public final boolean isNeeded(final String mana) { // ManaPart method - checkSingleMana(mana); + Mana_Part.checkSingleMana(mana); - return 0 < manaNeeded; + return 0 < this.manaNeeded; } /** {@inheritDoc} */ @@ -93,7 +93,7 @@ public class Mana_PartColorless extends Mana_Part { throw new RuntimeException("Mana_PartColorless received Mana type with amount > 1"); } - return 0 < manaNeeded; + return 0 < this.manaNeeded; } /** {@inheritDoc} */ @@ -119,35 +119,35 @@ public class Mana_PartColorless extends Mana_Part { @Override public final void reduce(final String mana) { // if mana is needed, then this mana cost is all paid up - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("Mana_PartColorless : reduce() error, argument mana not needed, mana - " + mana - + ", toString() - " + toString()); + + ", toString() - " + this.toString()); } - manaNeeded--; + this.manaNeeded--; } /** {@inheritDoc} */ @Override public final void reduce(final Mana mana) { // if mana is needed, then this mana cost is all paid up - if (!isNeeded(mana)) { + if (!this.isNeeded(mana)) { throw new RuntimeException("Mana_PartColorless : reduce() error, argument mana not needed, mana - " + mana - + ", toString() - " + toString()); + + ", toString() - " + this.toString()); } - manaNeeded--; + this.manaNeeded--; } /** {@inheritDoc} */ @Override public final boolean isPaid() { - return manaNeeded == 0; + return this.manaNeeded == 0; } /** {@inheritDoc} */ @Override public final int getConvertedManaCost() { - return manaNeeded; + return this.manaNeeded; } } diff --git a/src/main/java/forge/card/mana/Mana_PartPhyrexian.java b/src/main/java/forge/card/mana/Mana_PartPhyrexian.java index 7fbd6eaf0c1..4895c11b71f 100644 --- a/src/main/java/forge/card/mana/Mana_PartPhyrexian.java +++ b/src/main/java/forge/card/mana/Mana_PartPhyrexian.java @@ -9,8 +9,8 @@ package forge.card.mana; * @version $Id$ */ public class Mana_PartPhyrexian extends Mana_Part { - private Mana_PartColor wrappedColor; - private String color; + private final Mana_PartColor wrappedColor; + private final String color; /** *

@@ -21,11 +21,12 @@ public class Mana_PartPhyrexian extends Mana_Part { * a {@link java.lang.String} object. */ public Mana_PartPhyrexian(final String manaCostToPay) { - wrappedColor = new Mana_PartColor(manaCostToPay.substring(1)); - color = manaCostToPay.substring(1); + this.wrappedColor = new Mana_PartColor(manaCostToPay.substring(1)); + this.color = manaCostToPay.substring(1); } /** {@inheritDoc} */ + @Override public final boolean isEasierToPay(final Mana_Part part) { return true; } @@ -37,8 +38,9 @@ public class Mana_PartPhyrexian extends Mana_Part { * * @return a {@link java.lang.String} object. */ + @Override public final String toString() { - return wrappedColor.toString().equals("") ? "" : "P" + wrappedColor.toString(); + return this.wrappedColor.toString().equals("") ? "" : "P" + this.wrappedColor.toString(); } /** @@ -48,8 +50,9 @@ public class Mana_PartPhyrexian extends Mana_Part { * * @return a boolean. */ + @Override public final boolean isPaid() { - return wrappedColor.isPaid(); + return this.wrappedColor.isPaid(); } /** @@ -63,13 +66,15 @@ public class Mana_PartPhyrexian extends Mana_Part { * a {@link java.lang.String} object. * @return a boolean. */ + @Override public final boolean isColor(final String mana) { - return wrappedColor.isColor(mana); + return this.wrappedColor.isColor(mana); } /** {@inheritDoc} */ + @Override public final boolean isColor(final Mana mana) { - return wrappedColor.isColor(mana); + return this.wrappedColor.isColor(mana); } /** @@ -81,18 +86,21 @@ public class Mana_PartPhyrexian extends Mana_Part { * a {@link java.lang.String} object. * @return a boolean. */ + @Override public final boolean isNeeded(final String mana) { - return wrappedColor.isNeeded(mana); + return this.wrappedColor.isNeeded(mana); } /** {@inheritDoc} */ + @Override public final boolean isNeeded(final Mana mana) { - return wrappedColor.isNeeded(mana); + return this.wrappedColor.isNeeded(mana); } /** {@inheritDoc} */ + @Override public final void reduce(final String mana) { - wrappedColor.reduce(mana); + this.wrappedColor.reduce(mana); } /** @@ -105,8 +113,9 @@ public class Mana_PartPhyrexian extends Mana_Part { * @param mana * a {@link forge.card.mana.Mana} object. */ + @Override public final void reduce(final Mana mana) { - wrappedColor.reduce(mana); + this.wrappedColor.reduce(mana); } /** @@ -116,8 +125,9 @@ public class Mana_PartPhyrexian extends Mana_Part { * * @return a int. */ + @Override public final int getConvertedManaCost() { - return wrappedColor.getConvertedManaCost(); + return this.wrappedColor.getConvertedManaCost(); } /** @@ -126,6 +136,6 @@ public class Mana_PartPhyrexian extends Mana_Part { *

*/ public final void payLife() { - wrappedColor.reduce(color); + this.wrappedColor.reduce(this.color); } } diff --git a/src/main/java/forge/card/mana/Mana_PartSnow.java b/src/main/java/forge/card/mana/Mana_PartSnow.java index 4aa24455b71..3c69c2a8e6b 100644 --- a/src/main/java/forge/card/mana/Mana_PartSnow.java +++ b/src/main/java/forge/card/mana/Mana_PartSnow.java @@ -15,12 +15,13 @@ public class Mana_PartSnow extends Mana_Part { /** {@inheritDoc} */ @Override public final boolean isNeeded(final String mana) { - return !isPaid && mana.equals("S"); + return !this.isPaid && mana.equals("S"); } /** {@inheritDoc} */ + @Override public final boolean isNeeded(final Mana mana) { - return !isPaid && mana.isSnow(); + return !this.isPaid && mana.isSnow(); } /** {@inheritDoc} */ @@ -39,7 +40,7 @@ public class Mana_PartSnow extends Mana_Part { /** {@inheritDoc} */ @Override public final boolean isPaid() { - return isPaid; + return this.isPaid; } /** {@inheritDoc} */ @@ -48,7 +49,7 @@ public class Mana_PartSnow extends Mana_Part { if (mp instanceof Mana_PartColorless) { return false; } - return toString().length() >= mp.toString().length(); + return this.toString().length() >= mp.toString().length(); } /** {@inheritDoc} */ @@ -57,7 +58,7 @@ public class Mana_PartSnow extends Mana_Part { if (!mana.equals("S")) { throw new RuntimeException("Mana_PartSnow: reduce() error, " + mana + " is not snow mana"); } - isPaid = true; + this.isPaid = true; } /** {@inheritDoc} */ @@ -66,13 +67,13 @@ public class Mana_PartSnow extends Mana_Part { if (!mana.isSnow()) { throw new RuntimeException("Mana_PartSnow: reduce() error, " + mana + " is not snow mana"); } - isPaid = true; + this.isPaid = true; } /** {@inheritDoc} */ @Override public final String toString() { - return (isPaid ? "" : "S"); + return (this.isPaid ? "" : "S"); } /** {@inheritDoc} */ diff --git a/src/main/java/forge/card/mana/Mana_PartSplit.java b/src/main/java/forge/card/mana/Mana_PartSplit.java index 8a2cea9fa1e..35b6c5ce2b9 100644 --- a/src/main/java/forge/card/mana/Mana_PartSplit.java +++ b/src/main/java/forge/card/mana/Mana_PartSplit.java @@ -30,7 +30,7 @@ public class Mana_PartSplit extends Mana_Part { throw new RuntimeException("Mana_PartSplit : constructor() error, bad mana cost parameter - " + manaCost); } - originalCost = manaCost; + this.originalCost = manaCost; } /** @@ -41,7 +41,7 @@ public class Mana_PartSplit extends Mana_Part { * @return a boolean. */ private boolean isFirstTime() { - return manaPart == null; + return this.manaPart == null; } /** @@ -54,7 +54,7 @@ public class Mana_PartSplit extends Mana_Part { */ private void setup(final String manaToPay) { // get R out of "2/R" - String color = originalCost.substring(2, 3); + final String color = this.originalCost.substring(2, 3); // is manaToPay the one color we want or do we // treat it like colorless? @@ -62,67 +62,68 @@ public class Mana_PartSplit extends Mana_Part { // or R? if W use Mana_PartColorless, if R use Mana_PartColor // does manaToPay contain color? if (0 <= manaToPay.indexOf(color)) { - manaPart = new Mana_PartColor(color); + this.manaPart = new Mana_PartColor(color); } else { // get 2 out of "2/R" - manaPart = new Mana_PartColorless(originalCost.substring(0, 1)); + this.manaPart = new Mana_PartColorless(this.originalCost.substring(0, 1)); } - }// setup() + } // setup() /** {@inheritDoc} */ @Override public final void reduce(final String mana) { - if (isFirstTime()) { - setup(mana); + if (this.isFirstTime()) { + this.setup(mana); } - manaPart.reduce(mana); + this.manaPart.reduce(mana); } /** {@inheritDoc} */ @Override public final void reduce(final Mana mana) { - if (isFirstTime()) { - setup(Input_PayManaCostUtil.getShortColorString(mana.getColor())); + if (this.isFirstTime()) { + this.setup(Input_PayManaCostUtil.getShortColorString(mana.getColor())); } - manaPart.reduce(mana); + this.manaPart.reduce(mana); } /** {@inheritDoc} */ @Override public final boolean isNeeded(final String mana) { - if (isFirstTime()) { + if (this.isFirstTime()) { // always true because any mana can pay the colorless part of 2/G return true; } - return manaPart.isNeeded(mana); - }// isNeeded() + return this.manaPart.isNeeded(mana); + } // isNeeded() /** {@inheritDoc} */ + @Override public final boolean isNeeded(final Mana mana) { - if (isFirstTime()) { + if (this.isFirstTime()) { // always true because any mana can pay the colorless part of 2/G return true; } - return manaPart.isNeeded(mana); + return this.manaPart.isNeeded(mana); } /** {@inheritDoc} */ @Override public final boolean isColor(final String mana) { // ManaPart method - String mp = toString(); + final String mp = this.toString(); return mp.indexOf(mana) != -1; } /** {@inheritDoc} */ @Override public final boolean isColor(final Mana mana) { - String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); - String mp = toString(); + final String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); + final String mp = this.toString(); return mp.indexOf(color) != -1; } @@ -132,30 +133,30 @@ public class Mana_PartSplit extends Mana_Part { if (mp instanceof Mana_PartColorless) { return false; } - if (!isFirstTime()) { + if (!this.isFirstTime()) { return true; } - return toString().length() >= mp.toString().length(); + return this.toString().length() >= mp.toString().length(); } /** {@inheritDoc} */ @Override public final String toString() { - if (isFirstTime()) { - return originalCost; + if (this.isFirstTime()) { + return this.originalCost; } - return manaPart.toString(); + return this.manaPart.toString(); } /** {@inheritDoc} */ @Override public final boolean isPaid() { - if (isFirstTime()) { + if (this.isFirstTime()) { return false; } - return manaPart.isPaid(); + return this.manaPart.isPaid(); } /** {@inheritDoc} */ @@ -163,6 +164,6 @@ public class Mana_PartSplit extends Mana_Part { public final int getConvertedManaCost() { // grab the colorless portion of the split cost (usually 2, but possibly // more later) - return Integer.parseInt(originalCost.substring(0, 1)); + return Integer.parseInt(this.originalCost.substring(0, 1)); } } diff --git a/src/main/java/forge/card/mana/package-info.java b/src/main/java/forge/card/mana/package-info.java index a10d6cbd121..361ad2ab75a 100644 --- a/src/main/java/forge/card/mana/package-info.java +++ b/src/main/java/forge/card/mana/package-info.java @@ -1,2 +1,3 @@ /** Forge Card Game. */ package forge.card.mana; +