From b4d3894b35127606434bf21232699ccf3cfc161a Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 4 Sep 2011 17:40:26 +0000
Subject: [PATCH] fixing exception that happens when loading a deck with cards
 not found in our database.

---
 src/main/java/forge/card/CardDb.java      | 10 +++++-----
 src/main/java/forge/deck/DeckManager.java | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index afdb60a6826..fc3212f1fdf 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -69,7 +69,7 @@ public final class CardDb {
     public void addNewCard(final CardRules card) {
         if (null == card) { return; }
         //System.out.println(card.getName());
-        String cardName = card.getName();
+        String cardName = card.getName().toLowerCase();
 
         // 1. register among oracle uniques
         cards.put(cardName, card);
@@ -102,9 +102,9 @@ public final class CardDb {
     public CardPrinted getCard(final String name) {
         // Sometimes they read from decks things like "CardName|Set" - but we can handle it
         int pipePos = name.indexOf('|');
-        String cardName = name;
+        String cardName = name.toLowerCase();
         if (pipePos >= 0) {
-            cardName = name.substring(0, pipePos);
+            cardName = name.substring(0, pipePos).toLowerCase();
             String setName = name.substring(pipePos + 1);
             // only if set is not blank try to load it
             if (StringUtils.isNotBlank(setName)) {
@@ -120,13 +120,13 @@ public final class CardDb {
     public CardPrinted getCard(final String name, final String set) { return getCard(name, set, 0); }
     public CardPrinted getCard(final String name, final String set, final int artIndex) {
         // 1. get set
-        Map<String, CardPrinted[]> cardsFromset = allCardsBySet.get(set);
+        Map<String, CardPrinted[]> cardsFromset = allCardsBySet.get(set.toUpperCase());
         if (null == cardsFromset) {
             String err = String.format("Asked for card '%s' from set '%s': that set was not found. :(", name, set);
             throw new NoSuchElementException(err);
         }
         // 2. Find the card itself
-        CardPrinted[] cardCopies = cardsFromset.get(name);
+        CardPrinted[] cardCopies = cardsFromset.get(name.toLowerCase());
         if (null == cardCopies) {
             String err = String.format("Asked for card '%s' from '%s': set found, but the card wasn't. :(", name, set);
             throw new NoSuchElementException(err);
diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 83d2858c4b7..6643d58e366 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -4,6 +4,7 @@ package forge.deck;
 import forge.Constant;
 import forge.card.CardPrinted;
 import forge.error.ErrorViewer;
+import forge.gui.GuiUtils;
 
 import java.io.*;
 import java.util.*;
@@ -11,6 +12,8 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.swing.JOptionPane;
+
 import org.apache.commons.lang3.StringUtils;
 
 import static java.lang.Integer.parseInt;
@@ -219,8 +222,15 @@ public class DeckManager {
 
         files = deckDir.listFiles(DCKFileFilter);
         for (File file : files) {
-            Deck newDeck = readDeck(file);
-            deckMap.put(newDeck.getName(), newDeck);
+            
+            try {
+                Deck newDeck = readDeck(file);
+                deckMap.put(newDeck.getName(), newDeck);
+            } catch ( NoSuchElementException ex ) {
+                String message = String.format("Your deck '%s' failed to load beacuse %s", file.getName(), ex.getMessage());
+                JOptionPane.showMessageDialog(null, message, "One of your decks failed to load", JOptionPane.ERROR_MESSAGE);
+            }
+            
         }
 
         files = deckDir.listFiles(BDKFileFilter);