From 67eb55d4430343eb2be11f12367406d5055b709c Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 2 Aug 2012 18:51:30 +0000 Subject: [PATCH] - removed some unused functions from the card class. --- src/main/java/forge/Card.java | 59 +---------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 88904ddf304..2267cb11b27 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -72,8 +72,6 @@ public class Card extends GameEntity implements Comparable { private static int nextUniqueNumber = 1; private int uniqueNumber; - private long value; - private final Map characteristicsMap = new EnumMap(CardCharactersticName.class); private CardCharactersticName curCharacteristics = CardCharactersticName.Original; @@ -5336,21 +5334,6 @@ public class Card extends GameEntity implements Comparable { } } - /** - *

- * addNonStackingIntrinsicKeyword. - *

- * - * @param s - * a {@link java.lang.String} object. - */ - public final void addNonStackingIntrinsicKeyword(final String s) { - if (!this.getIntrinsicKeyword().contains(s) && (s.trim().length() != 0)) { - this.getCharacteristics().getIntrinsicKeyword() - .add((this.getName().trim().length() == 0 ? s : s.replaceAll(this.getName(), "CARDNAME"))); - } - } - /** *

* removeIntrinsicKeyword. @@ -5407,22 +5390,6 @@ public class Card extends GameEntity implements Comparable { } } - /** - *

- * addStackingExtrinsicKeyword. - *

- * - * @param s - * a {@link java.lang.String} object. - */ - public final void addStackingExtrinsicKeyword(final String s) { - if (s.startsWith("HIDDEN")) { - this.addHiddenExtrinsicKeyword(s); - } else { - this.extrinsicKeyword.add(s); - } - } - /** *

* removeExtrinsicKeyword. @@ -5620,8 +5587,7 @@ public class Card extends GameEntity implements Comparable { * @return a boolean. */ public final boolean isSpell() { - return (this.isInstant() || this.isSorcery() || (this.isAura() && !AllZoneUtil.getCardsIn(ZoneType.Battlefield) - .contains(this))); + return (this.isInstant() || this.isSorcery() || (this.isAura() && !this.isInZone((ZoneType.Battlefield)))); } /** @@ -5826,29 +5792,6 @@ public class Card extends GameEntity implements Comparable { return this.uniqueNumber; } - /** - *

- * Setter for the field value. - *

- * - * @param n - * a long. - */ - public final void setValue(final long n) { - this.value = n; - } - - /** - *

- * Getter for the field value. - *

- * - * @return a long. - */ - public final long getValue() { - return this.value; - } - /** {@inheritDoc} */ @Override public final int compareTo(final Card that) {