From 643b023afbfc8df0c5ee4397f666a19dafed43ff Mon Sep 17 00:00:00 2001 From: jendave Date: Wed, 2 Nov 2011 05:17:42 +0000 Subject: [PATCH] rename file --- .gitattributes | 2 +- src/main/java/forge/Card.java | 36 +++++++++---------- .../forge/{Card_Color.java => CardColor.java} | 6 ++-- src/main/java/forge/CardList.java | 2 +- src/main/java/forge/CardReader.java | 4 +-- src/main/java/forge/CardUtil.java | 2 +- src/main/java/forge/ColorChanger.java | 14 ++++---- src/main/java/forge/GuiDisplayUtil.java | 2 +- .../java/forge/card/CardCharacteristics.java | 10 +++--- .../card/cardFactory/CardFactoryUtil.java | 4 +-- 10 files changed, 41 insertions(+), 41 deletions(-) rename src/main/java/forge/{Card_Color.java => CardColor.java} (95%) diff --git a/.gitattributes b/.gitattributes index 378aec8ec58..45427272c47 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10249,6 +10249,7 @@ src/main/java/forge/AllZoneUtil.java svneol=native#text/plain src/main/java/forge/Base64Coder.java svneol=native#text/plain src/main/java/forge/ButtonUtil.java svneol=native#text/plain src/main/java/forge/Card.java svneol=native#text/plain +src/main/java/forge/CardColor.java svneol=native#text/plain src/main/java/forge/CardContainer.java svneol=native#text/plain src/main/java/forge/CardFilter.java svneol=native#text/plain src/main/java/forge/CardList.java svneol=native#text/plain @@ -10257,7 +10258,6 @@ src/main/java/forge/CardListUtil.java svneol=native#text/plain src/main/java/forge/CardPowerToughness.java svneol=native#text/plain src/main/java/forge/CardReader.java svneol=native#text/plain src/main/java/forge/CardUtil.java svneol=native#text/plain -src/main/java/forge/Card_Color.java svneol=native#text/plain src/main/java/forge/Card_Keywords.java -text src/main/java/forge/Card_Type.java svneol=native#text/plain src/main/java/forge/Color.java svneol=native#text/plain diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 1f87fb98e5d..10547d7e52c 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1633,7 +1633,7 @@ public class Card extends GameEntity implements Comparable { if (s.equals("")) { s = "0"; } - getCharacteristics().getCardColor().add(new Card_Color(new ManaCost(s), this, false, true)); + getCharacteristics().getCardColor().add(new CardColor(new ManaCost(s), this, false, true)); } /** @@ -1653,10 +1653,10 @@ public class Card extends GameEntity implements Comparable { */ public final long addColor(final String s, final Card c, final boolean addToColors, final boolean bIncrease) { if (bIncrease) { - Card_Color.increaseTimestamp(); + CardColor.increaseTimestamp(); } - getCharacteristics().getCardColor().add(new Card_Color(new ManaCost(s), c, addToColors, false)); - return Card_Color.getTimestamp(); + getCharacteristics().getCardColor().add(new CardColor(new ManaCost(s), c, addToColors, false)); + return CardColor.getTimestamp(); } /** @@ -1674,8 +1674,8 @@ public class Card extends GameEntity implements Comparable { * a long. */ public final void removeColor(final String s, final Card c, final boolean addTo, final long timestampIn) { - Card_Color removeCol = null; - for (Card_Color cc : getCharacteristics().getCardColor()) { + CardColor removeCol = null; + for (CardColor cc : getCharacteristics().getCardColor()) { if (cc.equals(s, c, addTo, timestampIn)) { removeCol = cc; } @@ -1691,14 +1691,14 @@ public class Card extends GameEntity implements Comparable { * determineColor. *

* - * @return a {@link forge.Card_Color} object. + * @return a {@link forge.CardColor} object. */ - public final Card_Color determineColor() { + public final CardColor determineColor() { if (this.isImmutable()) { - return new Card_Color(this); + return new CardColor(this); } - Card_Color colors = null; - ArrayList globalChanges = AllZone.getColorChanger().getColorChanges(); + CardColor colors = null; + ArrayList globalChanges = AllZone.getColorChanger().getColorChanges(); colors = determineColor(globalChanges); colors.fixColorless(); return colors; @@ -1712,7 +1712,7 @@ public class Card extends GameEntity implements Comparable { * @param colors * a {@link java.util.ArrayList} object. */ - public final void setColor(final ArrayList colors) { + public final void setColor(final ArrayList colors) { getCharacteristics().setCardColor(colors); } @@ -1723,7 +1723,7 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.util.ArrayList} object. */ - public final ArrayList getColor() { + public final ArrayList getColor() { return getCharacteristics().getCardColor(); } @@ -1735,8 +1735,8 @@ public class Card extends GameEntity implements Comparable { * an ArrayList * @return a Card_Color */ - final Card_Color determineColor(final ArrayList globalChanges) { - Card_Color colors = new Card_Color(this); + final CardColor determineColor(final ArrayList globalChanges) { + CardColor colors = new CardColor(this); int i = getCharacteristics().getCardColor().size() - 1; int j = -1; if (globalChanges != null) { @@ -1744,7 +1744,7 @@ public class Card extends GameEntity implements Comparable { } // if both have changes, see which one is most recent while (i >= 0 && j >= 0) { - Card_Color cc = null; + CardColor cc = null; if (getCharacteristics().getCardColor().get(i).getStamp() > globalChanges.get(j).getStamp()) { // Card has a more recent color stamp cc = getCharacteristics().getCardColor().get(i); @@ -1763,7 +1763,7 @@ public class Card extends GameEntity implements Comparable { } } while (i >= 0) { - Card_Color cc = getCharacteristics().getCardColor().get(i); + CardColor cc = getCharacteristics().getCardColor().get(i); i--; for (String s : cc.toStringArray()) { colors.addToCardColor(s); @@ -1773,7 +1773,7 @@ public class Card extends GameEntity implements Comparable { } } while (j >= 0) { - Card_Color cc = globalChanges.get(j); + CardColor cc = globalChanges.get(j); j--; for (String s : cc.toStringArray()) { colors.addToCardColor(s); diff --git a/src/main/java/forge/Card_Color.java b/src/main/java/forge/CardColor.java similarity index 95% rename from src/main/java/forge/Card_Color.java rename to src/main/java/forge/CardColor.java index 76e2af6f0d8..1301b7eae91 100644 --- a/src/main/java/forge/Card_Color.java +++ b/src/main/java/forge/CardColor.java @@ -13,7 +13,7 @@ import forge.card.mana.ManaCost; * @author Forge * @version $Id$ */ -public class Card_Color { +public class CardColor { // takes care of individual card color, for global color change effects use // AllZone.getGameInfo().getColorChanges() private EnumSet col; @@ -74,7 +74,7 @@ public class Card_Color { * @param baseColor * a boolean. */ - Card_Color(final ManaCost mc, final Card c, final boolean addToColors, final boolean baseColor) { + CardColor(final ManaCost mc, final Card c, final boolean addToColors, final boolean baseColor) { additional = addToColors; col = Color.convertManaCostToColor(mc); effectingCard = c; @@ -93,7 +93,7 @@ public class Card_Color { * @param c * a {@link forge.Card} object. */ - public Card_Color(final Card c) { + public CardColor(final Card c) { col = Color.colorless(); additional = false; stamp = 0; diff --git a/src/main/java/forge/CardList.java b/src/main/java/forge/CardList.java index 13fa2551a28..43eaa28e123 100644 --- a/src/main/java/forge/CardList.java +++ b/src/main/java/forge/CardList.java @@ -188,7 +188,7 @@ public class CardList implements Iterable { CardListFilter clrF = new CardListFilter() { public boolean addCard(final Card c) { - ArrayList cClrs = c.getColor(); + ArrayList cClrs = c.getColor(); for (int i = 0; i < cClrs.size(); i++) { if (!cClrs.get(i).toStringArray().get(0).equals(clr1) && !cClrs.get(i).toStringArray().get(0).equals(clr2)) { diff --git a/src/main/java/forge/CardReader.java b/src/main/java/forge/CardReader.java index dd5a5f10eca..3618497b6ca 100644 --- a/src/main/java/forge/CardReader.java +++ b/src/main/java/forge/CardReader.java @@ -468,9 +468,9 @@ public class CardReader implements Runnable, NewConstants { } } else if (line.startsWith("Colors:")) { final String value = line.substring("Colors:".length()); - ArrayList newCols = new ArrayList(); + ArrayList newCols = new ArrayList(); for (String col : value.split(",")) { - Card_Color newCol = new Card_Color(card); + CardColor newCol = new CardColor(card); newCol.addToCardColor(col); newCols.add(newCol); } diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 9c700698531..e9abe940b08 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -913,7 +913,7 @@ public final class CardUtil { public static CardList getRadiance(final Card source, final Card origin, final String[] valid) { CardList res = new CardList(); - for (Card_Color col : origin.getColor()) { + for (CardColor col : origin.getColor()) { for (String strCol : col.toStringArray()) { if (strCol.equalsIgnoreCase("Colorless")) { continue; diff --git a/src/main/java/forge/ColorChanger.java b/src/main/java/forge/ColorChanger.java index bebffe9426f..6dffea886f8 100644 --- a/src/main/java/forge/ColorChanger.java +++ b/src/main/java/forge/ColorChanger.java @@ -9,7 +9,7 @@ import forge.card.mana.ManaCost; * */ public class ColorChanger { - private ArrayList globalColorChanges = new ArrayList(); + private ArrayList globalColorChanges = new ArrayList(); /** *

@@ -29,10 +29,10 @@ public class ColorChanger { public final long addColorChanges(final String s, final Card c, final boolean addToColors, final boolean bIncrease) { if (bIncrease) { - Card_Color.increaseTimestamp(); + CardColor.increaseTimestamp(); } - globalColorChanges.add(new Card_Color(new ManaCost(s), c, addToColors, false)); - return Card_Color.getTimestamp(); + globalColorChanges.add(new CardColor(new ManaCost(s), c, addToColors, false)); + return CardColor.getTimestamp(); } /** @@ -50,8 +50,8 @@ public class ColorChanger { * a long. */ public final void removeColorChanges(final String s, final Card c, final boolean addTo, final long timestamp) { - Card_Color removeCol = null; - for (Card_Color cc : globalColorChanges) { + CardColor removeCol = null; + for (CardColor cc : globalColorChanges) { if (cc.equals(s, c, addTo, timestamp)) { removeCol = cc; } @@ -88,7 +88,7 @@ public class ColorChanger { * * @return a {@link java.util.ArrayList} object. */ - public final ArrayList getColorChanges() { + public final ArrayList getColorChanges() { return globalColorChanges; } } diff --git a/src/main/java/forge/GuiDisplayUtil.java b/src/main/java/forge/GuiDisplayUtil.java index 56cdcef5fe0..080a675e039 100644 --- a/src/main/java/forge/GuiDisplayUtil.java +++ b/src/main/java/forge/GuiDisplayUtil.java @@ -1494,7 +1494,7 @@ public final class GuiDisplayUtil implements NewConstants { } c.setIsFaceDown(true); c.setManaCost(""); - c.setColor(new ArrayList()); // remove all + c.setColor(new ArrayList()); // remove all // colors c.addColor("0"); c.setBaseAttack(2); diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java index bb7a6ebac76..b1324ab2ba3 100644 --- a/src/main/java/forge/card/CardCharacteristics.java +++ b/src/main/java/forge/card/CardCharacteristics.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import forge.Card_Color; +import forge.CardColor; import forge.SetInfo; import forge.card.spellability.Ability_Mana; import forge.card.spellability.SpellAbility; @@ -20,7 +20,7 @@ public class CardCharacteristics { private String name = ""; private ArrayList type = new ArrayList(); private String manaCost = ""; - private ArrayList cardColor = new ArrayList(); + private ArrayList cardColor = new ArrayList(); private boolean cardColorsOverridden = false; private int baseAttack = 0; private int baseDefense = 0; @@ -98,7 +98,7 @@ public class CardCharacteristics { * * @return the cardColor */ - public final ArrayList getCardColor() { + public final ArrayList getCardColor() { return cardColor; } @@ -108,8 +108,8 @@ public class CardCharacteristics { * @param cardColor0 * the cardColor to set */ - public final void setCardColor(final ArrayList cardColor0) { - this.cardColor = new ArrayList(cardColor0); // TODO: Add 0 + public final void setCardColor(final ArrayList cardColor0) { + this.cardColor = new ArrayList(cardColor0); // TODO: Add 0 // to // parameter's // name. diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 3fe064db4a2..2e5fb14e385 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -18,7 +18,7 @@ import forge.Card; import forge.CardList; import forge.CardListFilter; import forge.CardUtil; -import forge.Card_Color; +import forge.CardColor; import forge.Combat; import forge.CombatUtil; import forge.Command; @@ -1005,7 +1005,7 @@ public class CardFactoryUtil { // card.setName("Morph"); sourceCard.setIsFaceDown(true); sourceCard.setManaCost(""); - sourceCard.setColor(new ArrayList()); // remove all + sourceCard.setColor(new ArrayList()); // remove all // colors sourceCard.addColor("0"); sourceCard.setBaseAttack(2);