From 12ae0de97fd80da9c748b6bf0d3294d91f9ceb1b Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 20 Feb 2013 23:00:48 +0000
Subject: [PATCH] removed non-functional fields and methods from CardRules

---
 src/main/java/forge/card/CardRules.java       | 29 ---------
 .../java/forge/card/CardRulesPredicates.java  | 61 +++----------------
 2 files changed, 7 insertions(+), 83 deletions(-)

diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java
index 670c7da897e..ab3ed1adc5d 100644
--- a/src/main/java/forge/card/CardRules.java
+++ b/src/main/java/forge/card/CardRules.java
@@ -19,7 +19,6 @@ package forge.card;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import com.google.common.collect.Lists;
 
@@ -43,8 +42,6 @@ public final class CardRules implements ICardCharacteristics {
     private final ICardCharacteristics otherPart;
     
     private CardAiHints aiHints;
-
-    Map<String, CardInSet> setsPrinted = null;
     private Iterable<String> forgeScript;
 
 
@@ -58,32 +55,6 @@ public final class CardRules implements ICardCharacteristics {
     }
 
 
-    /**
-     * Gets the latest set printed.
-     * 
-     * @return the latest set printed
-     */
-    public String getLatestSetPrinted() {
-        String lastSet = null;
-        // TODO: Make a true release-date based sorting
-        for (final String cs : this.setsPrinted.keySet()) {
-            lastSet = cs;
-        }
-        return lastSet;
-    }
-
-
-
-    /**
-     * Gets the rarity from latest set.
-     * 
-     * @return the rarity from latest set
-     */
-    public CardRarity getRarityFromLatestSet() {
-        final CardInSet cis = this.setsPrinted.get(this.getLatestSetPrinted());
-        return cis.getRarity();
-    }
-
     /**
      * TODO: Write javadoc for this method.
      * @return
diff --git a/src/main/java/forge/card/CardRulesPredicates.java b/src/main/java/forge/card/CardRulesPredicates.java
index 1708c21f23e..d85ed201b5b 100644
--- a/src/main/java/forge/card/CardRulesPredicates.java
+++ b/src/main/java/forge/card/CardRulesPredicates.java
@@ -2,6 +2,9 @@ package forge.card;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -222,18 +225,6 @@ public final class CardRulesPredicates {
         return new PredicateSuperType(type, isEqual);
     }
 
-    /**
-     * Rarity in cards latest set.
-     * 
-     * @param isEqual
-     *            the is equal
-     * @param value
-     *            the value
-     * @return the predicate
-     */
-    public static Predicate<CardRules> rarityInCardsLatestSet(final boolean isEqual, final CardRarity value) {
-        return new PredicateLastesSetRarity(value, isEqual);
-    }
 
     /**
      * Checks for color.
@@ -444,21 +435,6 @@ public final class CardRulesPredicates {
         }
     }
 
-    private static class PredicateLastesSetRarity implements Predicate<CardRules> {
-        private final CardRarity operand;
-        private final boolean shouldBeEqual;
-
-        @Override
-        public boolean apply(final CardRules card) {
-            return card.getRarityFromLatestSet().equals(this.operand) == this.shouldBeEqual;
-        }
-
-        public PredicateLastesSetRarity(final CardRarity type, final boolean wantEqual) {
-            this.operand = type;
-            this.shouldBeEqual = wantEqual;
-        }
-    }
-
     private static class PredicateExistsInSets implements Predicate<CardRules> {
         private final List<String> sets;
 
@@ -468,11 +444,10 @@ public final class CardRulesPredicates {
 
         @Override
         public boolean apply(final CardRules subject) {
-            for (final String s : this.sets) {
-                if (subject.setsPrinted.containsKey(s)) {
-                    return true;
-                }
-            }
+            for(Entry<String, CardInSet> cs : subject.getSetsPrinted())
+                for (final String s : this.sets)
+                    if ( StringUtils.equalsIgnoreCase(cs.getKey(), s) )
+                        return true;
             return false;
         }
     }
@@ -572,27 +547,5 @@ public final class CardRulesPredicates {
             Presets.COLORS.add(Presets.IS_GREEN);
             Presets.COLORS.add(Presets.IS_COLORLESS);
         }
-
-        // Think twice before using these, since rarity is a prop of printed
-        // card.
-        /** The Constant isInLatestSetCommon. */
-        public static final Predicate<CardRules> IS_IN_LATEST_SET_COMMON = CardRulesPredicates.rarityInCardsLatestSet(
-                true, CardRarity.Common);
-
-        /** The Constant isInLatestSetUncommon. */
-        public static final Predicate<CardRules> IS_IN_LATEST_SET_UNCOMMON = CardRulesPredicates
-                .rarityInCardsLatestSet(true, CardRarity.Uncommon);
-
-        /** The Constant isInLatestSetRare. */
-        public static final Predicate<CardRules> IS_IN_LATEST_SET_RARE = CardRulesPredicates.rarityInCardsLatestSet(
-                true, CardRarity.Rare);
-
-        /** The Constant isInLatestSetMythicRare. */
-        public static final Predicate<CardRules> IS_IN_LATEST_SET_MYTHIC_RARE = CardRulesPredicates
-                .rarityInCardsLatestSet(true, CardRarity.MythicRare);
-
-        /** The Constant isInLatestSetSpecial. */
-        public static final Predicate<CardRules> IS_IN_LATEST_SET_SPECIAL = CardRulesPredicates.rarityInCardsLatestSet(
-                true, CardRarity.Special);
     }
 }