From 1d9bfe7cb2ce6c46cdabac8fece9b5fe8dca83b8 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 17 Nov 2012 14:00:53 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/card/EditionCollection.java | 2 +- .../forge/card/abilityfactory/ai/PumpAiBase.java | 4 ++-- .../forge/card/cardfactory/CardFactoryArtifacts.java | 2 +- .../forge/card/cardfactory/CardFactoryLands.java | 4 ++-- src/main/java/forge/card/cost/Cost.java | 4 ++-- src/main/java/forge/card/cost/CostMana.java | 2 +- src/main/java/forge/card/cost/CostPutCounter.java | 2 +- src/main/java/forge/card/cost/CostRemoveCounter.java | 12 ++++++------ src/main/java/forge/card/cost/CostTapType.java | 2 +- src/main/java/forge/card/cost/CostUtil.java | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/forge/card/EditionCollection.java b/src/main/java/forge/card/EditionCollection.java index a8505d9bd17..bb82c4da7aa 100644 --- a/src/main/java/forge/card/EditionCollection.java +++ b/src/main/java/forge/card/EditionCollection.java @@ -80,7 +80,7 @@ public final class EditionCollection extends StorageView { final CardEdition set = this.get(code); return set == null ? "" : set.getCode2(); } - + public final Function FN_EDITION_BY_CODE = new Function() { @Override public CardEdition apply(String code) { diff --git a/src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java b/src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java index b5e8cbccc2e..0c28d79396c 100644 --- a/src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java +++ b/src/main/java/forge/card/abilityfactory/ai/PumpAiBase.java @@ -407,14 +407,14 @@ public abstract class PumpAiBase extends SpellAiLogic { // is the creature unblocked and the spell will pump its power? if (phase.is(PhaseType.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY) - && Singletons.getModel().getGame().getCombat().isAttacking(c) + && Singletons.getModel().getGame().getCombat().isAttacking(c) && Singletons.getModel().getGame().getCombat().isUnblocked(c) && (attack > 0)) { return true; } // is the creature blocked and the blocker would survive if (phase.is(PhaseType.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY) && (attack > 0) - && Singletons.getModel().getGame().getCombat().isAttacking(c) + && Singletons.getModel().getGame().getCombat().isAttacking(c) && Singletons.getModel().getGame().getCombat().isBlocked(c) && Singletons.getModel().getGame().getCombat().getBlockers(c) != null && !Singletons.getModel().getGame().getCombat().getBlockers(c).isEmpty() diff --git a/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java b/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java index a7f86948984..f328aba3f19 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java @@ -380,7 +380,7 @@ class CardFactoryArtifacts { Zone zone = Singletons.getModel().getGame().getZoneOf(c); return zone.is(ZoneType.Hand) && c.getController() == card.getController(); } - + /* (non-Javadoc) * @see forge.control.input.InputSelectManyCards#onDone() */ diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index 05ba8baebab..a410b201568 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -286,7 +286,7 @@ class CardFactoryLands { } public void humanExecute() { - Singletons.getModel().getMatch().getInput().setInput(new InputSelectManyCards(0,1) { + Singletons.getModel().getMatch().getInput().setInput(new InputSelectManyCards(0, 1) { private static final long serialVersionUID = -2774066137824255680L; @Override @@ -299,7 +299,7 @@ class CardFactoryLands { Zone zone = Singletons.getModel().getGame().getZoneOf(c); return zone.is(ZoneType.Hand) && c.isType(type) && c.getController() == card.getController(); } - + @Override protected Input onDone() { String cardName = selected.get(0).getName(); diff --git a/src/main/java/forge/card/cost/Cost.java b/src/main/java/forge/card/cost/Cost.java index cd9e1a790d1..afd9619364f 100644 --- a/src/main/java/forge/card/cost/Cost.java +++ b/src/main/java/forge/card/cost/Cost.java @@ -364,7 +364,7 @@ public class Cost { if (xCantBe0) { parse = parse.replaceAll(XCANTBE0_STR, ""); } - + final String stripXCost = parse.replaceAll("X", ""); final int amountX = parse.length() - stripXCost.length(); @@ -451,7 +451,7 @@ public class Cost { } } - public final CostMana getCostMana () { + public final CostMana getCostMana() { // TODO: Change where ChangeCost happens for (final CostPart part : this.costParts) { if (part instanceof CostMana) { diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 8b7be841516..22133890860 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -164,7 +164,7 @@ public class CostMana extends CostPart { if (!this.mana.equals("0")) { sb.append(this.mana); } - + return sb.toString().trim(); } diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index ab073b564cf..f58d730a7f2 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -216,7 +216,7 @@ public class CostPutCounter extends CostPartWithList { c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); } - final List typeList = + final List typeList = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), ai, source); Card card = null; diff --git a/src/main/java/forge/card/cost/CostRemoveCounter.java b/src/main/java/forge/card/cost/CostRemoveCounter.java index 1693654485a..73142fd820d 100644 --- a/src/main/java/forge/card/cost/CostRemoveCounter.java +++ b/src/main/java/forge/card/cost/CostRemoveCounter.java @@ -289,7 +289,7 @@ public class CostRemoveCounter extends CostPartWithList { if (!this.getThis()) { this.getList().clear(); - final List typeList = + final List typeList = CardLists.getValidCards(ai.getCardsIn(this.getZone()), this.getType().split(";"), ai, source); for (Card card : typeList) { if (card.getCounters(this.getCounter()) >= c) { @@ -388,7 +388,7 @@ public class CostRemoveCounter extends CostPartWithList { return target; } - + /** *

* returnType. @@ -432,16 +432,16 @@ public class CostRemoveCounter extends CostPartWithList { if (o != null) { final Card card = o; - + if (card.getCounters(costRemoveCounter.getCounter()) > 0) { this.nRemove++; costRemoveCounter.addToList(card); card.subtractCounter(costRemoveCounter.getCounter(), 1); - + if (card.getCounters(costRemoveCounter.getCounter()) == 0) { this.typeList.remove(card); } - + if (nNeeded == this.nRemove) { this.done(); } else { @@ -474,4 +474,4 @@ public class CostRemoveCounter extends CostPartWithList { }; return target; } -} \ No newline at end of file +} diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 69f502e988f..c1598fda0e8 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -191,7 +191,7 @@ public class CostTapType extends CostPartWithList { if (c == null) { final String sVar = ability.getSVar(amount); if (sVar.equals("XChoice")) { - List typeList = + List typeList = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), ability.getActivatingPlayer(), ability.getSourceCard()); typeList = CardLists.filter(typeList, Presets.UNTAPPED); c = typeList.size(); diff --git a/src/main/java/forge/card/cost/CostUtil.java b/src/main/java/forge/card/cost/CostUtil.java index c1e8a9eff2a..b1918a0572d 100644 --- a/src/main/java/forge/card/cost/CostUtil.java +++ b/src/main/java/forge/card/cost/CostUtil.java @@ -83,7 +83,7 @@ public class CostUtil { continue; } - final List typeList = + final List typeList = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), type.split(","), source.getController(), source); if (ComputerUtil.getCardPreference(ai, source, "SacCost", typeList) == null) { return false;