From d02aec6606a3bcb3ae16db4269f6af8ff0a815a5 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 7 Nov 2012 13:59:29 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/CardPredicates.java | 45 ++++++++++++------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/forge/CardPredicates.java b/src/main/java/forge/CardPredicates.java index ac07aff71ed..5aa37b83f7d 100644 --- a/src/main/java/forge/CardPredicates.java +++ b/src/main/java/forge/CardPredicates.java @@ -38,8 +38,8 @@ import forge.util.PredicateString; * @version $Id$ */ public final class CardPredicates { - - public final static Predicate isController(final Player p) { + + public final static Predicate isController(final Player p) { return new Predicate() { @Override public boolean apply(final Card c) { @@ -55,7 +55,7 @@ public final class CardPredicates { } }; } - + public final static Predicate isType(final String cardType) { return new Predicate() { @Override @@ -64,7 +64,7 @@ public final class CardPredicates { } }; } - + public final static Predicate hasKeyword(final String keyword) { return new Predicate() { @Override @@ -73,7 +73,7 @@ public final class CardPredicates { } }; } - + public final static Predicate containsKeyword(final String keyword) { return new Predicate() { @Override @@ -82,7 +82,7 @@ public final class CardPredicates { } }; } - + public final static Predicate isTargetableBy(final SpellAbility source) { return new Predicate() { @Override @@ -91,7 +91,7 @@ public final class CardPredicates { } }; } - + public final static Predicate nameEquals(final String name) { return new Predicate() { @Override @@ -100,7 +100,6 @@ public final class CardPredicates { } }; } - public final static Predicate possibleBlockers(final Card attacker) { return new Predicate() { @@ -110,7 +109,7 @@ public final class CardPredicates { } }; } - + public final static Predicate possibleBlockerForAtLeastOne(final Iterable attackers) { return new Predicate() { @Override @@ -118,8 +117,8 @@ public final class CardPredicates { return c.isCreature() && CombatUtil.canBlockAtLeastOne(c, attackers); } }; - } - + } + public final static Predicate isProtectedFrom(final Card source) { return new Predicate() { @Override @@ -129,7 +128,6 @@ public final class CardPredicates { }; } - public final static Predicate restriction(final String[] restrictions, final Player sourceController, final Card source) { return new Predicate() { @Override @@ -137,7 +135,7 @@ public final class CardPredicates { return (c != null) && c.isValid(restrictions, sourceController, source); } }; - } + } public static class Presets { @@ -150,13 +148,13 @@ public final class CardPredicates { return c.isTapped(); } }; - + public static final Predicate CANUNTAP = new Predicate() { @Override public boolean apply(Card c) { return Untap.canUntap(c); } - }; + }; /** * a Predicate to get all cards that are untapped. */ @@ -175,7 +173,6 @@ public final class CardPredicates { return c.isCreature(); } }; - /** * a Predicate to get all enchantments. @@ -314,7 +311,7 @@ public final class CardPredicates { return c.isWhite(); } }; - + public static final Predicate hasFirstStrike = new Predicate() { @Override @@ -341,7 +338,7 @@ public final class CardPredicates { } }; } - + public static class Accessors { public static final Function fnGetDefense = new Function() { @Override @@ -355,27 +352,27 @@ public final class CardPredicates { public Integer apply(Card a) { return a.getNetAttack(); } - }; - + }; + public static final Function fnGetAttack = new Function() { @Override public Integer apply(Card a) { return a.getNetCombatDamage(); } }; - + public static final Function fnGetCmc = new Function() { @Override public Integer apply(Card a) { return a.getCMC(); } - }; - + }; + public static final Function fnEvaluateCreature = new Function() { @Override public Integer apply(Card a) { return CardFactoryUtil.evaluateCreature(a); } - }; + }; } }