From 3b725bd30af6c5de02470ded2f0a84437f7d40ed Mon Sep 17 00:00:00 2001
From: RumbleBBU <rumblebbu@cardforge.org>
Date: Sat, 26 Jan 2013 05:01:17 +0000
Subject: [PATCH] Minor cleanup of earlier commit; made variables final or
 unmodifiable where applicable.

---
 src/main/java/forge/quest/BoosterUtils.java       |  2 +-
 .../java/forge/quest/QuestRewardCardChooser.java  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/forge/quest/BoosterUtils.java b/src/main/java/forge/quest/BoosterUtils.java
index b7ea8aba0c2..5c07164f43d 100644
--- a/src/main/java/forge/quest/BoosterUtils.java
+++ b/src/main/java/forge/quest/BoosterUtils.java
@@ -298,7 +298,7 @@ public final class BoosterUtils {
             // Type 2: a duplicate card of the players choice
             rewards.add(new QuestRewardCardChooser(QuestRewardCardChooser.poolType.playerCards, temp));
         } else if (temp.length >= 2 && temp[0].equalsIgnoreCase("chosen") && temp[1].equalsIgnoreCase("card")) {
-            // Type 2: a duplicate card of the players choice
+            // Type 3: a duplicate card of the players choice
             rewards.add(new QuestRewardCardChooser(QuestRewardCardChooser.poolType.predicateFilter, temp));
         } else if (temp.length > 0) {
             // Type 4: assume we are asking for a single copy of a specific card
diff --git a/src/main/java/forge/quest/QuestRewardCardChooser.java b/src/main/java/forge/quest/QuestRewardCardChooser.java
index 68c24209a6d..273ddb3757b 100644
--- a/src/main/java/forge/quest/QuestRewardCardChooser.java
+++ b/src/main/java/forge/quest/QuestRewardCardChooser.java
@@ -95,7 +95,7 @@ public class QuestRewardCardChooser implements InventoryItem  {
 
         for (String s : input) {
             if (s.startsWith("sets:") || s.startsWith("Sets:")) {
-                String[] tmp = s.split(":");
+                final String[] tmp = s.split(":");
                 if (tmp.length > 1) {
                     String [] setcodes = tmp[1].split(",");
                     if (setcodes.length > 0) {
@@ -113,12 +113,12 @@ public class QuestRewardCardChooser implements InventoryItem  {
                     }
                 }
             } else if (s.startsWith("rules:") || s.startsWith("Rules:")) {
-                String[] tmp = s.split(":");
+                final String[] tmp = s.split(":");
                 if (tmp.length > 1) {
                     String [] ruleCodes = tmp[1].split(",");
                     if (ruleCodes.length > 0) {
                         for (String rule : ruleCodes) {
-                            Predicate<CardRules> newRule = BoosterUtils.parseRulesLimitation(rule);
+                            final Predicate<CardRules> newRule = BoosterUtils.parseRulesLimitation(rule);
                             if (newRule != null) {
                                 filterRules = (filterRules == null ? newRule : Predicates.or(filterRules, newRule));
                             }
@@ -126,12 +126,11 @@ public class QuestRewardCardChooser implements InventoryItem  {
                     }
                 }
             } else if (s.startsWith("rarity:") || s.startsWith("Rarity:")) {
-                String[] tmp = s.split(":");
+                final String[] tmp = s.split(":");
                 if (tmp.length > 1) {
                     String [] rarityCodes = tmp[1].split(",");
                     if (rarityCodes.length > 0) {
                         for (String rarity : rarityCodes) {
-                            Predicate<CardPrinted> rarityRule = null;
                             if (rarity.startsWith("C") || rarity.startsWith("c")) {
                                 filterRarity = (filterRarity == null ? CardPrinted.Predicates.Presets.IS_COMMON : Predicates.or(filterRarity, CardPrinted.Predicates.Presets.IS_COMMON));
                             } else if (rarity.startsWith("U") || rarity.startsWith("u")) {
@@ -148,7 +147,7 @@ public class QuestRewardCardChooser implements InventoryItem  {
         }
 
         if (filterRules != null) {
-            Predicate<CardPrinted> rulesPrinted = Predicates.compose(filterRules, CardPrinted.FN_GET_RULES);
+            final Predicate<CardPrinted> rulesPrinted = Predicates.compose(filterRules, CardPrinted.FN_GET_RULES);
             filters = Predicates.and(filters, rulesPrinted);
         }
         if (filterRarity != null) {
@@ -216,7 +215,7 @@ public class QuestRewardCardChooser implements InventoryItem  {
                 }
                 Collections.sort(cardChoices);
 
-                return cardChoices;
+                return Collections.unmodifiableList(cardChoices);
             }
 
         } else if (type == poolType.predicateFilter) {
@@ -227,7 +226,7 @@ public class QuestRewardCardChooser implements InventoryItem  {
             }
             Collections.sort(cardChoices);
 
-            return cardChoices;
+            return Collections.unmodifiableList(cardChoices);
         } else {
             throw new RuntimeException("Unknown QuestRewardCardType: " + type);
         }