From 9e5ec17ecf6be140524a84a8a900978bcab1c6c8 Mon Sep 17 00:00:00 2001 From: moomarc Date: Fri, 7 Sep 2012 08:44:41 +0000 Subject: [PATCH] - Fixed some minor checkstyle errors (mostly trailing linespaces) --- .../card/abilityfactory/AbilityFactory.java | 5 +- .../card/cardfactory/CardFactoryUtil.java | 51 ++++++++++--------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index 9bac8718547..e77654c2879 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -2818,9 +2818,8 @@ public class AbilityFactory { final AbilityFactory af = sa.getAbilityFactory(); if (af == null) { sa.resolve(); - if(sa.getSubAbility() != null) - { - resolve(sa.getSubAbility(),usedStack); + if (sa.getSubAbility() != null) { + resolve(sa.getSubAbility(), usedStack); } return; } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index f71d716a6ff..da9e8310b07 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -4822,49 +4822,50 @@ public class CardFactoryUtil { // add ability to instrinic strings so copies/clones create the ability also card.getIntrinsicAbilities().add(abilityStr.toString()); } - - for(String kw : card.getKeyword()) { - - if (kw.startsWith("ETBReplacement")) - { + + for (String kw : card.getKeyword()) { + + if (kw.startsWith("ETBReplacement")) { String[] splitkw = kw.split(":"); ReplacementLayer layer = ReplacementLayer.smartValueOf(splitkw[1]); AbilityFactory af = new AbilityFactory(); SpellAbility repAb = af.getAbility(card.getSVar(splitkw[2]), card); String desc = repAb.getDescription(); - setupETBReplacementAbility(repAb); - + setupETBReplacementAbility(repAb); + String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Description$ " + desc; - if(splitkw.length == 4) { - if(splitkw[3].contains("Optional")) { + if (splitkw.length == 4) { + if (splitkw[3].contains("Optional")) { repeffstr += " | Optional$ True"; } } - + ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card); re.setLayer(layer); - re.setOverridingAbility(repAb); - + re.setOverridingAbility(repAb); + card.addReplacementEffect(re); } } - + return card; } - + public static void setupETBReplacementAbility(SpellAbility sa) { SpellAbility tailend = sa; - while(tailend.getSubAbility() != null) { + while (tailend.getSubAbility() != null) { tailend = tailend.getSubAbility(); } - + class ETBReplacementMove extends AbilitySub { private static final long serialVersionUID = 704771599662730112L; /** * TODO: Write javadoc for Constructor. * @param sourceCard + * the source card * @param tgt + * the target */ public ETBReplacementMove(Card sourceCard, Target tgt) { super(sourceCard, tgt); @@ -4872,7 +4873,7 @@ public class CardFactoryUtil { @Override public void resolve() { - forge.Singletons.getModel().getGameAction().moveToPlay(((Card)this.getReplacingObject("Card"))); + forge.Singletons.getModel().getGameAction().moveToPlay(((Card) this.getReplacingObject("Card"))); } /* (non-Javadoc) @@ -4889,7 +4890,7 @@ public class CardFactoryUtil { @Override public AbilitySub getCopy() { // TODO Auto-generated method stub - return new ETBReplacementMove(getSourceCard(),null); + return new ETBReplacementMove(getSourceCard(), null); } /* (non-Javadoc) @@ -4900,10 +4901,10 @@ public class CardFactoryUtil { // TODO Auto-generated method stub return false; } - + } - - tailend.setSubAbility(new ETBReplacementMove(sa.getSourceCard(),null)); + + tailend.setSubAbility(new ETBReplacementMove(sa.getSourceCard(), null)); } /** @@ -5155,11 +5156,11 @@ public class CardFactoryUtil { card.clearDevoured(); if (card.getController().isHuman()) { if (creats.size() > 0) { - final List selection = GuiUtils.getOrderChoices("Devour", "Devouring", false, (Object[])creats.toArray()); + final List selection = GuiUtils.getOrderChoices("Devour", "Devouring", false, (Object[]) creats.toArray()); numCreatures[0] = selection.size(); - - for(Object o : selection) { - Card dinner = (Card)o; + + for (Object o : selection) { + Card dinner = (Card) o; card.addDevoured(dinner); Singletons.getModel().getGameAction().sacrifice(dinner, null); }