From e2b750d0643873dcebb180c4afd2b3cc70a42bac Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 29 Feb 2012 20:13:35 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/CardUtil.java | 10 ++++++---- src/main/java/forge/Combat.java | 4 ++-- src/main/java/forge/CombatUtil.java | 2 +- src/main/java/forge/ComputerAIGeneral.java | 2 +- src/main/java/forge/DefaultPlayerZone.java | 7 ++++--- src/main/java/forge/PlayerZoneComesIntoPlay.java | 7 ++++--- .../java/forge/card/spellability/SpellPermanent.java | 4 ++-- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 99ef5491512..c64df94d348 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -71,12 +71,14 @@ public final class CardUtil { * @return a {@link forge.Card} object. */ public static T getRandom(final T[] o) { - if ( o == null ) throw new IllegalArgumentException("CardUtil : getRandom(T) recieved null instead of array."); + if (o == null) { + throw new IllegalArgumentException("CardUtil : getRandom(T) recieved null instead of array."); + } int len = o.length; - switch(len) { - case 0: throw new IllegalArgumentException("CardUtil : getRandom(T) recieved an empty array."); + switch(len) { + case 0: throw new IllegalArgumentException("CardUtil : getRandom(T) recieved an empty array."); case 1: return o[0]; - default: return o[CardUtil.RANDOM.nextInt(len)]; + default: return o[CardUtil.RANDOM.nextInt(len)]; } } diff --git a/src/main/java/forge/Combat.java b/src/main/java/forge/Combat.java index fba0f8889f0..fd2425a7c53 100644 --- a/src/main/java/forge/Combat.java +++ b/src/main/java/forge/Combat.java @@ -941,7 +941,7 @@ public class Combat { */ public final List getUnblockedAttackers() { final List out = new ArrayList(); - for(Card c : this.unblockedMap.keySet()) { + for (Card c : this.unblockedMap.keySet()) { if (!c.hasFirstStrike()) { out.add(c); } @@ -958,7 +958,7 @@ public class Combat { */ public final List getUnblockedFirstStrikeAttackers() { final List out = new ArrayList(); - for(Card c : this.unblockedMap.keySet()) { // only add creatures without firstStrike to this + for (Card c : this.unblockedMap.keySet()) { // only add creatures without firstStrike to this if (c.hasFirstStrike() || c.hasDoubleStrike()) { out.add(c); } diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index e3b234bd317..44de6f907fc 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -714,7 +714,7 @@ public class CombatUtil { int cntAttackers = combat.getAttackers().size(); for (final Card card : AllZoneUtil.getCardsIn(Constant.Zone.Battlefield)) { for (final String keyword : card.getKeyword()) { - if (keyword.equals("No more than one creature can attack each combat.") && cntAttackers > 0 ) { + if (keyword.equals("No more than one creature can attack each combat.") && cntAttackers > 0) { return false; } if (keyword.equals("No more than two creatures can attack each combat.") && cntAttackers > 1) { diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/ComputerAIGeneral.java index c1a54bb6295..06f3d1f0f38 100644 --- a/src/main/java/forge/ComputerAIGeneral.java +++ b/src/main/java/forge/ComputerAIGeneral.java @@ -227,7 +227,7 @@ public class ComputerAIGeneral implements Computer { } /** - * Returns the spellAbilities from the card list + * Returns the spellAbilities from the card list. * * @param l * a {@link forge.CardList} object. diff --git a/src/main/java/forge/DefaultPlayerZone.java b/src/main/java/forge/DefaultPlayerZone.java index 69bada22cec..f01fe2b6d07 100644 --- a/src/main/java/forge/DefaultPlayerZone.java +++ b/src/main/java/forge/DefaultPlayerZone.java @@ -199,9 +199,10 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl @Override public final void setCards(final Iterable cards) { List toSet = new ArrayList(); - for(Card c : cards) + for (Card c : cards) { toSet.add(c); - this.setCardList( toSet ); + } + this.setCardList(toSet); this.update(); } @@ -313,7 +314,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl * @return an array of {@link forge.Card} objects. */ @Override - public final ListgetCards() { + public final List getCards() { return this.getCards(true); } diff --git a/src/main/java/forge/PlayerZoneComesIntoPlay.java b/src/main/java/forge/PlayerZoneComesIntoPlay.java index cbe6153f7e9..a9dc47e34a5 100644 --- a/src/main/java/forge/PlayerZoneComesIntoPlay.java +++ b/src/main/java/forge/PlayerZoneComesIntoPlay.java @@ -353,12 +353,13 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone { // Battlefield filters out Phased Out cards by default. Needs to call // getCards(false) to get Phased Out cards - if (!filter) + if (!filter) { return new ArrayList(this.getCardList()); + } final ArrayList list = new ArrayList(); - for(Card crd : this.getCardList()) - { + for (Card crd : this.getCardList()) { + if (!crd.isPhasedOut()) { list.add(crd); } diff --git a/src/main/java/forge/card/spellability/SpellPermanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java index 2bb29747f35..5e09b147d63 100644 --- a/src/main/java/forge/card/spellability/SpellPermanent.java +++ b/src/main/java/forge/card/spellability/SpellPermanent.java @@ -282,7 +282,7 @@ public class SpellPermanent extends Spell { if (card.getSVar("PlayMain1").equals("TRUE")) { wait = false; } - if ((card.isCreature() && (ComputerAIGeneral.hasACardGivingHaste() + if ((card.isCreature() && (ComputerAIGeneral.hasACardGivingHaste() || card.hasKeyword("Haste"))) || card.hasKeyword("Exalted")) { wait = false; } @@ -348,7 +348,7 @@ public class SpellPermanent extends Spell { return canPlayFromEffectAI(false, true); } // canPlayAI() - + /** {@inheritDoc} */ @Override public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) {