From c4df569af1581ec2e40f02275c39ce21b2403ce2 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 8 Oct 2011 07:49:38 +0000 Subject: [PATCH] Checkstyle fixes --- .gitattributes | 2 +- src/main/java/forge/GameAction.java | 8 ++--- src/main/java/forge/Player.java | 2 +- ...Play.java => PlayerZoneComesIntoPlay.java} | 31 ++++++++++--------- 4 files changed, 22 insertions(+), 21 deletions(-) rename src/main/java/forge/{PlayerZone_ComesIntoPlay.java => PlayerZoneComesIntoPlay.java} (93%) diff --git a/.gitattributes b/.gitattributes index 43b20a32afc..1abde37ccd7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10042,7 +10042,7 @@ src/main/java/forge/Player.java svneol=native#text/plain src/main/java/forge/PlayerType.java svneol=native#text/plain src/main/java/forge/PlayerUtil.java svneol=native#text/plain src/main/java/forge/PlayerZone.java svneol=native#text/plain -src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain +src/main/java/forge/PlayerZoneComesIntoPlay.java svneol=native#text/plain src/main/java/forge/SetInfo.java svneol=native#text/plain src/main/java/forge/SetUtils.java svneol=native#text/plain src/main/java/forge/SimpleCombat.java svneol=native#text/plain diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 7f4ee218a11..2b72af6c65f 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -262,8 +262,8 @@ public class GameAction { } AllZone.getTriggerHandler().suppressMode("ChangesZone"); - ((PlayerZone_ComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(false); - ((PlayerZone_ComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(false); + ((PlayerZoneComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(false); + ((PlayerZoneComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(false); int tiz = c.getTurnInZone(); @@ -273,8 +273,8 @@ public class GameAction { c.setTurnInZone(tiz); AllZone.getTriggerHandler().clearSuppression("ChangesZone"); - ((PlayerZone_ComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(true); - ((PlayerZone_ComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(true); + ((PlayerZoneComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(true); + ((PlayerZoneComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(true); } /** diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 979affffdcc..4f3b58f11cd 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -68,7 +68,7 @@ public abstract class Player extends GameEntity { */ public Player(String myName, int myLife, int myPoisonCounters) { for (Zone z : ALL_ZONES) { - PlayerZone toPut = z == Zone.Battlefield ? new PlayerZone_ComesIntoPlay(z, this) : new DefaultPlayerZone(z, this); + PlayerZone toPut = z == Zone.Battlefield ? new PlayerZoneComesIntoPlay(z, this) : new DefaultPlayerZone(z, this); zones.put(z, toPut); } diff --git a/src/main/java/forge/PlayerZone_ComesIntoPlay.java b/src/main/java/forge/PlayerZoneComesIntoPlay.java similarity index 93% rename from src/main/java/forge/PlayerZone_ComesIntoPlay.java rename to src/main/java/forge/PlayerZoneComesIntoPlay.java index 03bff4347c4..5a798b51e08 100644 --- a/src/main/java/forge/PlayerZone_ComesIntoPlay.java +++ b/src/main/java/forge/PlayerZoneComesIntoPlay.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { +public class PlayerZoneComesIntoPlay extends DefaultPlayerZone { /** Constant serialVersionUID=5750837078903423978L. */ private static final long serialVersionUID = 5750837078903423978L; @@ -27,7 +27,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { * @param zone a {@link java.lang.String} object. * @param player a {@link forge.Player} object. */ - public PlayerZone_ComesIntoPlay(final Constant.Zone zone, final Player player) { + public PlayerZoneComesIntoPlay(final Constant.Zone zone, final Player player) { super(zone, player); } @@ -99,7 +99,9 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { list = list.filter(new CardListFilter() { public boolean addCard(final Card c) { return c.hasKeyword("Landfall") - || c.hasKeyword("Landfall - Whenever a land enters the battlefield under your control, CARDNAME gets +2/+2 until end of turn."); + || c.hasKeyword( + "Landfall - Whenever a land enters the battlefield under your control, " + + "CARDNAME gets +2/+2 until end of turn."); } }); @@ -110,12 +112,12 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { // Check for a mountain if (!listValakut.isEmpty() && c.isType("Mountain") ) { for (int i = 0; i < listValakut.size(); i++) { - boolean b = GameActionUtil.executeValakutEffect(listValakut.get(i),c); - if (!b) { - // Not enough mountains to activate Valakut -- stop the loop - break; - } - } + boolean b = GameActionUtil.executeValakutEffect(listValakut.get(i),c); + if (!b) { + // Not enough mountains to activate Valakut -- stop the loop + break; + } + } }*/ //Tectonic Instability @@ -315,21 +317,20 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone { leavesTrigger = b; } - @Override - public Card[] getCards(boolean filter) { + public final Card[] getCards(final boolean filter) { // Battlefield filters out Phased Out cards by default. Needs to call getCards(false) to get Phased Out cards Card[] c; - if (!filter){ + if (!filter) { c = new Card[cards.size()]; cards.toArray(c); } - else{ + else { Iterator itr = cards.iterator(); ArrayList list = new ArrayList(); - while(itr.hasNext()){ + while (itr.hasNext()) { Card crd = itr.next(); - if (!crd.isPhasedOut()){ + if (!crd.isPhasedOut()) { list.add(crd); } }