From ca379162f0ed3acc16052449a2ab5658dd69b693 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Thu, 1 Sep 2011 11:07:55 +0000
Subject: [PATCH] Renamed "getAIDeckNewFormat()" to "getAIDeckFromFile()" in
 quest area. Renamed "getAIDeck()" to "getAIDeckFromMap()" in quest area.

Updated references.
---
 src/main/java/forge/Gui_Quest_DeckEditor_Menu.java     | 4 ++--
 src/main/java/forge/quest/data/QuestBattleManager.java | 8 ++++----
 src/main/java/forge/quest/gui/main/QuestBattle.java    | 2 +-
 src/main/java/forge/quest/gui/main/QuestMainPanel.java | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/forge/Gui_Quest_DeckEditor_Menu.java b/src/main/java/forge/Gui_Quest_DeckEditor_Menu.java
index 137edfb78f8..90a7c0e4551 100644
--- a/src/main/java/forge/Gui_Quest_DeckEditor_Menu.java
+++ b/src/main/java/forge/Gui_Quest_DeckEditor_Menu.java
@@ -611,7 +611,7 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar {
                 StringBuffer allText = new StringBuffer();
 
                 for (String aNameList : nameList) {
-                    deck = QuestBattleManager.getAIDeck(aNameList);
+                    deck = QuestBattleManager.getAIDeckFromMap(aNameList);
                     allText.append(deck.getName()).append("\r\n");
                     allText.append(getExportDeckText(deck));
                     allText.append("++++++++++++++++++++++++++++++++++++++++++++++++++++++ \r\n \r\n");
@@ -634,7 +634,7 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar {
 
                 setComputerPlayer(deckName);
 
-                Deck d = QuestBattleManager.getAIDeck(deckName);
+                Deck d = QuestBattleManager.getAIDeckFromMap(deckName);
                 CardList deck = new CardList();
 
                 for (int i = 0; i < d.countMain(); i++) {
diff --git a/src/main/java/forge/quest/data/QuestBattleManager.java b/src/main/java/forge/quest/data/QuestBattleManager.java
index b77758a8b5c..1556e1c2ebd 100644
--- a/src/main/java/forge/quest/data/QuestBattleManager.java
+++ b/src/main/java/forge/quest/data/QuestBattleManager.java
@@ -57,17 +57,17 @@ public class QuestBattleManager {
     }
 
     /**
-     * <p>getAIDeck.</p>
+     * <p>getAIDeckFromMap.</p>
      * Returns a deck object stored in the 
      *{@link forge.quest.gui.main.aiDecks} map.
      *
      * @param deckName a {@link java.lang.String} object.
      * @return a {@link forge.deck.Deck} object.
      */
-    public static Deck getAIDeck(String deckName) {
+    public static Deck getAIDeckFromMap(String deckName) {
         if (!aiDecks.containsKey(deckName)) {
             ErrorViewer.showError(new Exception(),
-                    "QuestData : getDeckFromMap(String deckName) error, deck name not found - %s", deckName);
+                    "QuestData : getAIDeckFromMap(String deckName) error, deck name not found - %s", deckName);
         }
 
         return aiDecks.get(deckName);
@@ -80,7 +80,7 @@ public class QuestBattleManager {
      * @param deckName a {@link java.lang.String} object.
      * @return a {@link forge.deck.Deck} object.
      */
-    public static Deck getDeckFromFile(String deckName) {
+    public static Deck getAIDeckFromFile(String deckName) {
         final File file = ForgeProps.getFile(NewConstants.QUEST.DECKS);
         final DeckManager manager = new DeckManager(file);
         return manager.getDeck(deckName);
diff --git a/src/main/java/forge/quest/gui/main/QuestBattle.java b/src/main/java/forge/quest/gui/main/QuestBattle.java
index 90a5843b440..d68ea41176a 100644
--- a/src/main/java/forge/quest/gui/main/QuestBattle.java
+++ b/src/main/java/forge/quest/gui/main/QuestBattle.java
@@ -59,7 +59,7 @@ public class QuestBattle extends QuestSelectablePanel {
         String[] oppDecks = QuestBattleManager.getOpponents();
         for (String oppDeckName : oppDecks) {
             // Get deck object and properties for this opponent.
-            oppDeck    = QuestBattleManager.getDeckFromFile(oppDeckName);
+            oppDeck    = QuestBattleManager.getAIDeckFromFile(oppDeckName);
             
             oppName         = oppDeck.getMetadata("DisplayName");
             oppDiff         = oppDeck.getMetadata("Difficulty");
diff --git a/src/main/java/forge/quest/gui/main/QuestMainPanel.java b/src/main/java/forge/quest/gui/main/QuestMainPanel.java
index 07b2c8407fb..387e1f1a670 100644
--- a/src/main/java/forge/quest/gui/main/QuestMainPanel.java
+++ b/src/main/java/forge/quest/gui/main/QuestMainPanel.java
@@ -680,7 +680,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
      */
     void setupBattle(Deck humanDeck) {
 
-        Deck computer = QuestBattleManager.getDeckFromFile((selectedOpponent).getName());
+        Deck computer = QuestBattleManager.getAIDeckFromFile((selectedOpponent).getName());
         Constant.Runtime.ComputerDeck[0] = computer;
 
         AllZone.getGameAction().newGame(humanDeck, computer, forge.quest.data.QuestUtil.getHumanPlantAndPet(questData),
@@ -695,7 +695,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
     private void setupQuest(Deck humanDeck) {
         Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment();
 
-        Deck computerDeck = QuestBattleManager.getDeckFromFile("quest" + selectedQuest.getId());
+        Deck computerDeck = QuestBattleManager.getAIDeckFromFile("quest" + selectedQuest.getId());
         Constant.Runtime.ComputerDeck[0] = computerDeck;
 
         AllZone.setQuestAssignment(selectedQuest);