Added base Predicates and MageObject Predicates.

Mage/src/mage/filter/predicate/IntComparePredicate.java

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate;
+
+import mage.MageObject;
+import mage.filter.Filter;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public abstract class IntComparePredicate<T extends MageObject> implements Predicate<T> {
+
+    protected final Filter.ComparisonType type;
+    protected final int value;
+
+    public IntComparePredicate(Filter.ComparisonType type, int value) {
+        this.type = type;
+        this.value = value;
+    }
+
+    protected abstract int getInputValue(T input);
+
+    @Override
+    public final boolean apply(T input, Game game) {
+        int inputValue = input.getPower().getValue();
+        switch (type) {
+            case Equal:
+                if (inputValue != value) {
+                    return false;
+                }
+                break;
+            case GreaterThan:
+                if (inputValue <= value) {
+                    return false;
+                }
+                break;
+            case LessThan:
+                if (inputValue >= value) {
+                    return false;
+                }
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return type.toString() + value;
+    }
+}

Mage/src/mage/filter/predicate/Predicate.java

@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate;
+
+import java.io.Serializable;
+import mage.game.Game;
+
+/**
+ * Determines a true or false value for a given input.
+ *
+ * @author North
+ */
+public interface Predicate <T> extends Serializable {
+    /**
+     * Returns the result of applying this predicate to {@code input}. This method is <i>generally
+     * expected</i>, but not absolutely required, to have the following properties:
+     *
+     * <ul>
+     * <li>Its execution does not cause any observable side effects.</li>
+     * <li>The computation is <i>consistent with equals</i>; that is, {@link Objects#equal
+     *     Objects.equal}{@code (a, b)} implies that {@code predicate.apply(a) ==
+     *     predicate.apply(b)}.</li>
+     * </ul>
+     *
+     * @throws NullPointerException if {@code input} is null and this predicate does not accept null
+     *     arguments
+     */
+    boolean apply(T input, Game game);
+}

Mage/src/mage/filter/predicate/Predicates.java

@@ -0,0 +1,229 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import mage.game.Game;
+
+/**
+ * Static utility methods pertaining to {@code Predicate} instances.
+ *
+ * <p>All methods returns serializable predicates as long as they're given serializable parameters.</p>
+ *
+ * @author North
+ */
+public final class Predicates {
+
+    private Predicates() {
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if the given predicate evaluates to {@code false}.
+     */
+    public static <T> Predicate<T> not(Predicate<T> predicate) {
+        return new NotPredicate<T>(predicate);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if each of its components evaluates to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a false predicate is
+     * found. It defensively copies the iterable passed in, so future changes to it won't alter the behavior of this
+     * predicate. If {@code components} is empty, the returned predicate will always evaluate to {@code true}.
+     */
+    public static <T> Predicate<T> and(Iterable<? extends Predicate<? super T>> components) {
+        return new AndPredicate<T>(defensiveCopy(components));
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if each of its components evaluates to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a false predicate is
+     * found. It defensively copies the array passed in, so future changes to it won't alter the behavior of this
+     * predicate. If {@code components} is empty, the returned predicate will always evaluate to {@code true}.
+     */
+    public static <T> Predicate<T> and(Predicate<? super T>... components) {
+        return new AndPredicate<T>(defensiveCopy(components));
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both of its components evaluate to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a false predicate is
+     * found.
+     */
+    public static <T> Predicate<T> and(Predicate<? super T> first, Predicate<? super T> second) {
+        return new AndPredicate<T>(Predicates.<T>asList(checkNotNull(first), checkNotNull(second)));
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if any one of its components evaluates to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a true predicate is found.
+     * It defensively copies the iterable passed in, so future changes to it won't alter the behavior of this predicate.
+     * If {@code components} is empty, the returned predicate will always evaluate to {@code true}.
+     */
+    public static <T> Predicate<T> or(Iterable<? extends Predicate<? super T>> components) {
+        return new OrPredicate<T>(defensiveCopy(components));
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if any one of its components evaluates to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a true predicate is found.
+     * It defensively copies the array passed in, so future changes to it won't alter the behavior of this predicate. If
+     * {@code components} is empty, the returned predicate will always evaluate to {@code true}.
+     */
+    public static <T> Predicate<T> or(Predicate<? super T>... components) {
+        return new OrPredicate<T>(defensiveCopy(components));
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if either of its components evaluates to {@code true}. The
+     * components are evaluated in order, and evaluation will be "short-circuited" as soon as a true predicate is found.
+     */
+    public static <T> Predicate<T> or(Predicate<? super T> first, Predicate<? super T> second) {
+        return new OrPredicate<T>(Predicates.<T>asList(first, second));
+    }
+
+    /**
+     * @see Predicates#not(Predicate)
+     */
+    private static class NotPredicate<T> implements Predicate<T> {
+
+        final Predicate<T> predicate;
+
+        NotPredicate(Predicate<T> predicate) {
+            this.predicate = checkNotNull(predicate);
+        }
+
+        @Override
+        public boolean apply(T t, Game game) {
+            return !predicate.apply(t, game);
+        }
+
+        @Override
+        public String toString() {
+            return "Not(" + predicate.toString() + ")";
+        }
+        private static final long serialVersionUID = 0;
+    }
+
+    /**
+     * @see Predicates#and(Iterable)
+     */
+    private static class AndPredicate<T> implements Predicate<T> {
+
+        private final List<? extends Predicate<? super T>> components;
+
+        private AndPredicate(List<? extends Predicate<? super T>> components) {
+            this.components = components;
+        }
+
+        @Override
+        public boolean apply(T t, Game game) {
+            for (int i = 0; i < components.size(); i++) {
+                if (!components.get(i).apply(t, game)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "And(" + commaJoin(components) + ")";
+        }
+        private static final long serialVersionUID = 0;
+    }
+
+    /**
+     * @see Predicates#or(Iterable)
+     */
+    private static class OrPredicate<T> implements Predicate<T> {
+
+        private final List<? extends Predicate<? super T>> components;
+
+        private OrPredicate(List<? extends Predicate<? super T>> components) {
+            this.components = components;
+        }
+
+        @Override
+        public boolean apply(T t, Game game) {
+            for (int i = 0; i < components.size(); i++) {
+                if (components.get(i).apply(t, game)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return "Or(" + commaJoin(components) + ")";
+        }
+        private static final long serialVersionUID = 0;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> List<Predicate<? super T>> asList(Predicate<? super T> first, Predicate<? super T> second) {
+        return Arrays.<Predicate<? super T>>asList(first, second);
+    }
+
+    private static <T> List<T> defensiveCopy(T... array) {
+        return defensiveCopy(Arrays.asList(array));
+    }
+
+    static <T> List<T> defensiveCopy(Iterable<T> iterable) {
+        ArrayList<T> list = new ArrayList<T>();
+        for (T element : iterable) {
+            list.add(checkNotNull(element));
+        }
+        return list;
+    }
+
+    /**
+     * Ensures that an object reference passed as a parameter to the calling method is not null.
+     *
+     * @param reference an object reference
+     * @return the non-null reference that was validated
+     * @throws NullPointerException if {@code reference} is null
+     */
+    private static <T> T checkNotNull(T reference) {
+        if (reference == null) {
+            throw new NullPointerException();
+        }
+        return reference;
+    }
+
+    private static String commaJoin(List components) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < components.size(); i++) {
+            sb.append(components.get(i).toString());
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+}

Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java

@@ -0,0 +1,63 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.abilities.Abilities;
+import mage.abilities.Ability;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class AbilityPredicate<T extends MageObject> implements Predicate<T> {
+
+    private final Class<?> abilityClass;
+
+    public AbilityPredicate(Class<?> abilityClass) {
+        this.abilityClass = abilityClass;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        Abilities<Ability> abilities = input.getAbilities();
+        for (int i = 0; i < abilities.size(); i++) {
+            if (abilityClass.equals(abilities.get(i).getClass())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "Ability(" + abilityClass.toString() + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java

@@ -0,0 +1,56 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.Constants.CardType;
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class CardTypePredicate<T extends MageObject> implements Predicate<T> {
+
+    private final CardType cardType;
+
+    public CardTypePredicate(CardType cardType) {
+        this.cardType = cardType;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return input.getCardType().contains(cardType);
+    }
+
+    @Override
+    public String toString() {
+        return "CardType(" + cardType.toString() + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java

@@ -0,0 +1,56 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.ObjectColor;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class ColorPredicate<T extends MageObject> implements Predicate<T> {
+
+    private final ObjectColor color;
+
+    public ColorPredicate(ObjectColor color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return input.getColor().contains(color);
+    }
+
+    @Override
+    public String toString() {
+        return "Color(" + color.toString() + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java

@@ -0,0 +1,49 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class ColorlessPredicate<T extends MageObject> implements Predicate<T> {
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return input.getColor().isColorless();
+    }
+
+    @Override
+    public String toString() {
+        return "Colorless";
+    }
+}

Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java

@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.Filter;
+import mage.filter.predicate.IntComparePredicate;
+
+/**
+ *
+ * @author North
+ */
+public class ConvertedManaCostPredicate<T extends MageObject> extends IntComparePredicate<T> {
+
+    public ConvertedManaCostPredicate(Filter.ComparisonType type, int value) {
+        super(type, value);
+    }
+
+    @Override
+    protected int getInputValue(T input) {
+        return input.getManaCost().convertedManaCost();
+    }
+
+    @Override
+    public String toString() {
+        return "ConvertedManaCost" + super.toString();
+    }
+}

Mage/src/mage/filter/predicate/mageobject/NamePredicate.java

@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class NamePredicate<T extends MageObject> implements Predicate<T> {
+
+    private final String name;
+
+    public NamePredicate(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return name.equals(input.getName());
+    }
+
+    @Override
+    public String toString() {
+        return "Name(" + name + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java

@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.Filter;
+import mage.filter.predicate.IntComparePredicate;
+
+/**
+ *
+ * @author North
+ */
+public class PowerPredicate<T extends MageObject> extends IntComparePredicate<T> {
+
+    public PowerPredicate(Filter.ComparisonType type, int value) {
+        super(type, value);
+    }
+
+    @Override
+    protected int getInputValue(T input) {
+        return input.getPower().getValue();
+    }
+
+    @Override
+    public String toString() {
+        return "Power" + super.toString();
+    }
+}

Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java

@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class SubtypePredicate<T extends MageObject> implements Predicate<T> {
+
+    private final String subtype;
+
+    public SubtypePredicate(String subtype) {
+        this.subtype = subtype;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return input.getSubtype().contains(subtype);
+    }
+
+    @Override
+    public String toString() {
+        return "Subtype(" + subtype + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/Supertype.java

@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author North
+ */
+public class Supertype<T extends MageObject> implements Predicate<T> {
+
+    private final String supertype;
+
+    public Supertype(String supertype) {
+        this.supertype = supertype;
+    }
+
+    @Override
+    public boolean apply(T input, Game game) {
+        return input.getSupertype().contains(supertype);
+    }
+
+    @Override
+    public String toString() {
+        return "Supertype(" + supertype + ')';
+    }
+}

Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java

@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.mageobject;
+
+import mage.MageObject;
+import mage.filter.Filter;
+import mage.filter.predicate.IntComparePredicate;
+
+/**
+ *
+ * @author North
+ */
+public class ToughnessPredicate<T extends MageObject> extends IntComparePredicate<T> {
+
+    public ToughnessPredicate(Filter.ComparisonType type, int value) {
+        super(type, value);
+    }
+
+    @Override
+    protected int getInputValue(T input) {
+        return input.getToughness().getValue();
+    }
+
+    @Override
+    public String toString() {
+        return "Toughness" + super.toString();
+    }
+}