From 74aa0a491712d74f70ab5071d613a7875b68647f Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 18 Jun 2013 10:04:18 +0000 Subject: [PATCH] cleanup in Target constructors --- .../forge/card/cardfactory/CardFactory.java | 2 +- .../java/forge/card/spellability/Target.java | 46 ++++--------------- .../card/spellability/TargetChoices.java | 2 +- src/main/java/forge/game/player/Player.java | 2 +- .../forge/gui/input/InputSelectTargets.java | 1 + 5 files changed, 13 insertions(+), 40 deletions(-) diff --git a/src/main/java/forge/card/cardfactory/CardFactory.java b/src/main/java/forge/card/cardfactory/CardFactory.java index d0961c415dc..fe25a3a583c 100644 --- a/src/main/java/forge/card/cardfactory/CardFactory.java +++ b/src/main/java/forge/card/cardfactory/CardFactory.java @@ -189,7 +189,7 @@ public class CardFactory { //remove all costs copySA.setPayCosts(new Cost("", sa.isAbility())); if (definedTarget != null) { - Target target = new Target(null, ""); + Target target = new Target(); target.setDefinedTarget(definedTarget); copySA.setTarget(target); } diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java index cb0eff951e4..a58241e305a 100644 --- a/src/main/java/forge/card/spellability/Target.java +++ b/src/main/java/forge/card/spellability/Target.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import forge.Card; @@ -49,7 +50,7 @@ public class Target { // What this Object is restricted to targeting private boolean tgtValid = false; private String[] validTgts; - private String vtSelection = ""; + private String uiPrompt = ""; private List tgtZone = Arrays.asList(ZoneType.Battlefield); //SpellAbility Restrictions @@ -96,7 +97,7 @@ public class Target { */ public Target(final Target target) { this.tgtValid = true; - this.vtSelection = target.getVTSelection(); + this.uiPrompt = target.getVTSelection(); this.validTgts = target.getValidTgts(); this.minTargets = target.getMinTargets(); this.maxTargets = target.getMaxTargets(); @@ -118,20 +119,8 @@ public class Target { this.choice = target.getTargetChoices(); } - /** - *

- * Constructor for Target. - *

- * - * @param src - * a {@link forge.Card} object. - * @param select - * a {@link java.lang.String} object. - * @param valid - * an array of {@link java.lang.String} objects. - */ - public Target(final String select, final String[] valid) { - this(select, valid, "1", "1"); + public Target() { + this(null, ArrayUtils.EMPTY_STRING_ARRAY, "1", "1"); } /** @@ -141,23 +130,7 @@ public class Target { * * @param src * a {@link forge.Card} object. - * @param select - * a {@link java.lang.String} object. - * @param valid - * a {@link java.lang.String} object. - */ - public Target(final String select, final String valid) { - this(select, valid.split(","), "1", "1"); - } - - /** - *

- * Constructor for Target. - *

- * - * @param src - * a {@link forge.Card} object. - * @param select + * @param prompt * a {@link java.lang.String} object. * @param valid * an array of {@link java.lang.String} objects. @@ -166,11 +139,10 @@ public class Target { * @param max * a {@link java.lang.String} object. */ - public Target(final String select, final String[] valid, final String min, final String max) { + public Target(final String prompt, final String[] valid, final String min, final String max) { this.tgtValid = true; - this.vtSelection = select; + this.uiPrompt = prompt; this.validTgts = valid; - this.minTargets = min; this.maxTargets = max; } @@ -251,7 +223,7 @@ public class Target { * @return a {@link java.lang.String} object. */ public final String getVTSelection() { - return this.vtSelection; + return this.uiPrompt; } /** diff --git a/src/main/java/forge/card/spellability/TargetChoices.java b/src/main/java/forge/card/spellability/TargetChoices.java index 5bf4cbb1772..2a1e92b91b3 100644 --- a/src/main/java/forge/card/spellability/TargetChoices.java +++ b/src/main/java/forge/card/spellability/TargetChoices.java @@ -60,7 +60,7 @@ public class TargetChoices { * a {@link java.lang.Object} object. * @return a boolean. */ - public final boolean addTarget(final Object o) { + public final boolean addTarget(final ITargetable o) { if (o instanceof Player) { return this.addTarget((Player) o); } else if (o instanceof Card) { diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index e76b45aa94b..e5c6e992765 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1302,7 +1302,7 @@ public class Player extends GameEntity implements Comparable { if (chainsList != null && (numDrawnThisDrawStep > 0 || !game.getPhaseHandler().is(PhaseType.DRAW))) { for(Card c : chainsList) { // I have to target this player - don't know how to do it. - Target target = new Target(null, ""); + Target target = new Target(); target.addTarget(this); if (getCardsIn(ZoneType.Hand).isEmpty()) { diff --git a/src/main/java/forge/gui/input/InputSelectTargets.java b/src/main/java/forge/gui/input/InputSelectTargets.java index dcff4019fe0..2be155b7d7c 100644 --- a/src/main/java/forge/gui/input/InputSelectTargets.java +++ b/src/main/java/forge/gui/input/InputSelectTargets.java @@ -60,6 +60,7 @@ public final class InputSelectTargets extends InputSyncronizedBase { sb.append("\n"); } //sb.append(tgt.getTargetedString()).append("\n"); + sb.append(sa.getSourceCard()).append(" - "); sb.append(tgt.getVTSelection()); int maxTargets = tgt.getMaxTargets(sa.getSourceCard(), sa);