From 1317f0ee7ff9cbde69aafdb69199d7cb1077f4d3 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 10 Feb 2012 13:04:20 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/Combat.java | 10 +++++----- src/main/java/forge/CombatUtil.java | 8 ++++---- .../card/abilityfactory/AbilityFactoryChangeZone.java | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/forge/Combat.java b/src/main/java/forge/Combat.java index 263fc21fdea..aa3e868e6da 100644 --- a/src/main/java/forge/Combat.java +++ b/src/main/java/forge/Combat.java @@ -713,8 +713,8 @@ public class Combat { needFirstStrike = true; if (this.getAttackingPlayer().isHuman()) { // human attacks if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.") - && GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" + - " though it weren't blocked?")) { + && GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" + + " though it weren't blocked?")) { this.addDefendingDamage(damageDealt, attacker); } else { if (attacker.hasKeyword("Trample") || (block.size() > 1)) { @@ -765,8 +765,8 @@ public class Combat { if (this.getAttackingPlayer().isHuman()) { // human attacks if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.") - && GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" + - " though it weren't blocked?")) { + && GameActionUtil.showYesNoDialog(attacker, "Do you want to assign its combat damage as" + + " though it weren't blocked?")) { this.addDefendingDamage(damageDealt, attacker); } else { if (attacker.hasKeyword("Trample") || (block.size() > 1)) { @@ -799,7 +799,7 @@ public class Combat { */ private void distributeAIDamage(final Card attacker, final CardList block, int damage) { final Card c = attacker; - + if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) { this.addDefendingDamage(damage, attacker); } diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 696c65fe880..9377bb4cb78 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -1063,8 +1063,8 @@ public class CombatUtil { final CardList blockers = combat.getBlockers(attacker); - if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage " + - "as though it weren't blocked.")) { + if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage " + + "as though it weren't blocked.")) { unblocked.add(attacker); } else if (attacker.hasKeyword("Trample") && (CombatUtil.getAttack(attacker) > CombatUtil.totalShieldDamage(attacker, blockers))) { @@ -1104,8 +1104,8 @@ public class CombatUtil { final CardList blockers = combat.getBlockers(attacker); - if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage" + - " as though it weren't blocked.")) { + if (blockers.size() == 0 || attacker.hasKeyword("You may have CARDNAME assign its combat damage" + + " as though it weren't blocked.")) { unblocked.add(attacker); } else if (attacker.hasKeyword("Trample") && (CombatUtil.getAttack(attacker) > CombatUtil.totalShieldDamage(attacker, blockers))) { diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index a02a1635e26..38d1fd78ad6 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java @@ -819,7 +819,7 @@ public final class AbilityFactoryChangeZone { CardList fetchList; if (defined) { fetchList = new CardList(AbilityFactory.getDefinedCards(card, params.get("Defined"), sa)); - } else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)){ + } else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)) { fetchList = AllZoneUtil.getCardsIn(origin); } else { fetchList = player.getCardsIn(origin); @@ -914,7 +914,7 @@ public final class AbilityFactoryChangeZone { } movedCard = AllZone.getGameAction().moveTo(c.getController().getZone(destination), c); - } else if(destination.equals(Zone.Exile)) { + } else if (destination.equals(Zone.Exile)) { movedCard = AllZone.getGameAction().exile(c); if (params.containsKey("ExileFaceDown")) { movedCard.setState("FaceDown"); @@ -988,7 +988,7 @@ public final class AbilityFactoryChangeZone { CardList fetchList; if (defined) { fetchList = new CardList(AbilityFactory.getDefinedCards(card, params.get("Defined"), sa)); - } else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)){ + } else if (!origin.contains(Zone.Library) && !origin.contains(Zone.Hand)) { fetchList = AllZoneUtil.getCardsIn(origin); fetchList = AbilityFactory.filterListByType(fetchList, type, sa); } else { @@ -1102,7 +1102,7 @@ public final class AbilityFactoryChangeZone { } newCard = AllZone.getGameAction().moveTo(c.getController().getZone(destination), c); - } else if(destination.equals(Zone.Exile)) { + } else if (destination.equals(Zone.Exile)) { newCard = AllZone.getGameAction().exile(c); if (params.containsKey("ExileFaceDown")) { newCard.setState("FaceDown");