From c8617c0a55cff441019f60f7ddcc80f06909d312 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Sat, 21 Jul 2012 21:52:37 +0300
Subject: [PATCH] [filters] replaced Paired filter with predicate

---
 ...rNotPairedControlledCreaturePermanent.java | 81 -------------------
 .../mage/watchers/common/SoulbondWatcher.java | 20 ++++-
 2 files changed, 18 insertions(+), 83 deletions(-)
 delete mode 100644 Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java

diff --git a/Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java b/Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java
deleted file mode 100644
index c9bb0dcaa2e..00000000000
--- a/Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  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.common;
-
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-
-import java.util.UUID;
-
-/**
- *
- * @author noxx
- */
-public class FilterNotPairedControlledCreaturePermanent extends FilterControlledCreaturePermanent {
-
-    public FilterNotPairedControlledCreaturePermanent() {
-        this("not paired creature you control");
-    }
-
-    public FilterNotPairedControlledCreaturePermanent(String name) {
-        super(name);
-    }
-
-    public FilterNotPairedControlledCreaturePermanent(final FilterNotPairedControlledCreaturePermanent filter) {
-        super(filter);
-    }
-
-    @Override
-    public boolean match(Permanent permanent, Game game) {
-        if (!super.match(permanent, game))
-            return notFilter;
-
-        if (permanent.getPairedCard() != null)
-            return notFilter;
-
-        return !notFilter;
-    }
-
-    @Override
-    public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
-        if (!super.match(permanent, sourceId, playerId, game))
-            return notFilter;
-
-        if (permanent.getPairedCard() != null)
-            return notFilter;
-
-        return !notFilter;
-    }
-
-    @Override
-    public FilterNotPairedControlledCreaturePermanent copy() {
-        return new FilterNotPairedControlledCreaturePermanent(this);
-    }
-
-}
diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/mage/watchers/common/SoulbondWatcher.java
index 71128aca828..209ca79c8e9 100644
--- a/Mage/src/mage/watchers/common/SoulbondWatcher.java
+++ b/Mage/src/mage/watchers/common/SoulbondWatcher.java
@@ -33,7 +33,9 @@ import mage.Constants.WatcherScope;
 import mage.abilities.keyword.SoulbondAbility;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
-import mage.filter.common.FilterNotPairedControlledCreaturePermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.Predicate;
+import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -50,10 +52,11 @@ import mage.watchers.WatcherImpl;
  */
 public class SoulbondWatcher extends WatcherImpl<SoulbondWatcher> {
 
-    private static final FilterNotPairedControlledCreaturePermanent filter = new FilterNotPairedControlledCreaturePermanent("another not paired creature you control");
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control");
 
     static {
         filter.add(new AnotherPredicate());
+        filter.add(Predicates.not(new PairedPredicate()));
     }
 
     public SoulbondWatcher() {
@@ -125,3 +128,16 @@ public class SoulbondWatcher extends WatcherImpl<SoulbondWatcher> {
         return new SoulbondWatcher(this);
     }
 }
+
+class PairedPredicate implements Predicate<Permanent> {
+
+    @Override
+    public boolean apply(Permanent input, Game game) {
+        return input.getPairedCard() != null;
+    }
+
+    @Override
+    public String toString() {
+        return "Paired";
+    }
+}