From fc0678f8a59cced5110f11eae615546616d81c5f Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Thu, 26 Jul 2012 20:30:35 +0000
Subject: [PATCH] - removed the unnecessary variable targetsForChoices from the
 Card class.

---
 src/main/java/forge/Card.java                 | 51 +++----------------
 .../cardfactory/CardFactorySorceries.java     | 15 +-----
 2 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 6f669f5112d..237ed643867 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -105,8 +105,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     // if this card is an Aura, what Entity is it enchanting?
     private GameEntity enchanting = null;
     private ArrayList<String> prevType = new ArrayList<String>();
-    private final ArrayList<String> choicesMade = new ArrayList<String>();
-    private final ArrayList<String> targetsForChoices = new ArrayList<String>();
+    private ArrayList<String> choicesMade = null;
 
     // changes by AF animate and continuous static effects
     private ArrayList<CardType> changedCardTypes = new ArrayList<CardType>();
@@ -265,7 +264,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 
         return true;
     }
-    
+
     /**
      * Sets the state.
      * 
@@ -3167,14 +3166,14 @@ public class Card extends GameEntity implements Comparable<Card> {
 
     /**
      * <p>
-     * addSpellChoice.
+     * setSpellChoice.
      * </p>
      * 
-     * @param string
-     *            a {@link java.lang.String} object.
+     * @param strings
+     *            a ArrayList<String> object.
      */
-    public final void addSpellChoice(final String string) {
-        this.choicesMade.add(string);
+    public final void setSpellChoice(final ArrayList<String> strings) {
+        this.choicesMade = strings;
     }
 
     /**
@@ -3201,42 +3200,6 @@ public class Card extends GameEntity implements Comparable<Card> {
         return this.choicesMade.get(i);
     }
 
-    /**
-     * <p>
-     * setSpellChoiceTarget.
-     * </p>
-     * 
-     * @param string
-     *            a {@link java.lang.String} object.
-     */
-    public final void setSpellChoiceTarget(final String string) {
-        this.targetsForChoices.add(string);
-    }
-
-    /**
-     * <p>
-     * getChoiceTargets.
-     * </p>
-     * 
-     * @return a {@link java.util.ArrayList} object.
-     */
-    public final ArrayList<String> getChoiceTargets() {
-        return this.targetsForChoices;
-    }
-
-    /**
-     * <p>
-     * getChoiceTarget.
-     * </p>
-     * 
-     * @param i
-     *            a int.
-     * @return a {@link java.lang.String} object.
-     */
-    public final String getChoiceTarget(final int i) {
-        return this.targetsForChoices.get(i);
-    }
-
     /**
      * <p>
      * setSpellWithChoices.
diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
index fcb92e14208..d90cf66ba8c 100644
--- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
+++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
@@ -1479,12 +1479,7 @@ public class CardFactorySorceries {
                 @Override
                 public void selectCard(final Card c, final PlayerZone zone) {
                     if (c.isCreature() && zone.is(ZoneType.Battlefield) && c.canBeTargetedBy(spell)) {
-                        if (card.isCopiedSpell()) {
-                            card.getChoiceTargets().remove(0);
-                        }
                         ab2card[0] = c;
-                        // spell.setTargetCard(c);
-                        card.setSpellChoiceTarget(String.valueOf(c.getUniqueNumber()));
                         setStackDescription.execute();
 
                         if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) {
@@ -1560,12 +1555,7 @@ public class CardFactorySorceries {
                 @Override
                 public void selectPlayer(final Player player) {
                     if (player.canBeTargetedBy(spell)) {
-                        if (card.isCopiedSpell()) {
-                            card.getChoiceTargets().remove(0);
-                        }
                         ab0player[0] = player;
-                        // spell.setTargetPlayer(player);
-                        card.setSpellChoiceTarget(player.toString());
                         setStackDescription.execute();
 
                         if (userChoice.contains(cardChoice[1]) || card.getChoices().contains(cardChoice[1])) {
@@ -1657,8 +1647,6 @@ public class CardFactorySorceries {
                         ab1card[0] = null;
                         ab2card[0] = null;
                         ab3cards.clear();
-                        card.getChoices().clear();
-                        card.getChoiceTargets().clear();
                         userChoice.clear();
 
                         final ArrayList<String> display = new ArrayList<String>();
@@ -1701,7 +1689,6 @@ public class CardFactorySorceries {
                     }
 
                     out.add((String) o);
-                    card.addSpellChoice((String) o);
                     choices.remove(out.get(0));
                     o = GuiUtils.chooseOneOrNone("Choose Two", choices.toArray());
                     if (o == null) {
@@ -1709,7 +1696,7 @@ public class CardFactorySorceries {
                     }
 
                     out.add((String) o);
-                    card.addSpellChoice((String) o);
+                    card.setSpellChoice(out);
                     return out;
                 } // chooseTwo()
             }; // Input chooseTwoInput