From 90cc030c483121e742fb2eb3c9f74c35b8b876f6 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 16 Apr 2012 19:47:39 +0000 Subject: [PATCH] - CheckStyle. --- .../java/forge/deck/generate/GenerateColoredDeckBase.java | 4 ++-- src/main/java/forge/deck/generate/GenerateDeckUtil.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java index a27e9cce549..1ad6c3e509a 100644 --- a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java +++ b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java @@ -186,11 +186,11 @@ public abstract class GenerateColoredDeckBase { // start with all cards // remove cards that generated decks don't like - Predicate canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay; + Predicate canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.HUMAN_CAN_PLAY : GenerateDeckUtil.AI_CAN_PLAY; Predicate hasColor = new GenerateDeckUtil.ContainsAllColorsFrom(colors); if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) { - hasColor = Predicate.or(hasColor, GenerateDeckUtil.colorlessCards); + hasColor = Predicate.or(hasColor, GenerateDeckUtil.COLORLESS_CARDS); } return Predicate.and(canPlay, hasColor).select(CardDb.instance().getAllCards(), CardPrinted.FN_GET_RULES); diff --git a/src/main/java/forge/deck/generate/GenerateDeckUtil.java b/src/main/java/forge/deck/generate/GenerateDeckUtil.java index 76d44ed03e4..e8464a26534 100644 --- a/src/main/java/forge/deck/generate/GenerateDeckUtil.java +++ b/src/main/java/forge/deck/generate/GenerateDeckUtil.java @@ -38,21 +38,21 @@ import forge.util.closures.Predicate; */ public class GenerateDeckUtil { - public static final Predicate aiCanPlay = new Predicate() { + public static final Predicate AI_CAN_PLAY = new Predicate() { @Override public boolean isTrue(CardRules c) { return !c.getRemAIDecks() && !c.getRemRandomDecks(); } }; - public static final Predicate humanCanPlay = new Predicate() { + public static final Predicate HUMAN_CAN_PLAY = new Predicate() { @Override public boolean isTrue(CardRules c) { return !c.getRemRandomDecks(); } }; - public static final Predicate colorlessCards = new Predicate() { + public static final Predicate COLORLESS_CARDS = new Predicate() { @Override public boolean isTrue(CardRules c) { CardManaCost mc = c.getManaCost();