From 04a38b79ac6cd59c14d352fa8358951a4280596c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Mon, 3 Feb 2014 08:16:44 +0000
Subject: [PATCH] Old-format decks will load without exceptions

---
 .../src/main/java/forge/deck/io/DeckSerializer.java | 13 +++----------
 .../src/main/java/forge/deck/io/DeckStorage.java    |  2 +-
 .../src/main/java/forge/deck/io/OldDeckParser.java  |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
index ce3eab56b1b..3ee898aac07 100644
--- a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
+++ b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
@@ -23,7 +23,7 @@ public class DeckSerializer {
         FileUtil.writeFile(f, serializeDeck(d));
     }
 
-    static DeckFileHeader readDeckMetadata(final Map<String, List<String>> map, final boolean canThrow) {
+    static DeckFileHeader readDeckMetadata(final Map<String, List<String>> map) {
         if (map == null) {
             return null;
         }
@@ -33,9 +33,6 @@ public class DeckSerializer {
         }
         final List<String> general = map.get("general");
         if (general != null) {
-            if (canThrow) {
-                throw new OldDeckFileFormatException();
-            }
             final FileSectionManual fs = new FileSectionManual();
             fs.put(DeckFileHeader.NAME, StringUtils.join(map.get(""), " "));
             fs.put(DeckFileHeader.DECK_TYPE, StringUtils.join(general, " "));
@@ -66,19 +63,15 @@ public class DeckSerializer {
     }
 
     public static Deck fromFile(final File deckFile) {
-        return fromSections(FileSection.parseSections(FileUtil.readFile(deckFile)), false);
+        return fromSections(FileSection.parseSections(FileUtil.readFile(deckFile)));
     }
 
     public static Deck fromSections(final Map<String, List<String>> sections) {
-        return fromSections(sections, false);
-    }
-
-    static Deck fromSections(final Map<String, List<String>> sections, final boolean canThrowExtendedErrors) {
         if (sections == null || sections.isEmpty()) {
             return null;
         }
     
-        final DeckFileHeader dh = readDeckMetadata(sections, canThrowExtendedErrors);
+        final DeckFileHeader dh = readDeckMetadata(sections);
         if (dh == null) {
             return null;
         }
diff --git a/forge-core/src/main/java/forge/deck/io/DeckStorage.java b/forge-core/src/main/java/forge/deck/io/DeckStorage.java
index 3ed31b3f966..02f49d77277 100644
--- a/forge-core/src/main/java/forge/deck/io/DeckStorage.java
+++ b/forge-core/src/main/java/forge/deck/io/DeckStorage.java
@@ -82,7 +82,7 @@ public class DeckStorage extends StorageReaderFolder<Deck> implements IItemSeria
     @Override
     protected Deck read(final File file) {
         final Map<String, List<String>> sections = FileSection.parseSections(FileUtil.readFile(file));
-        Deck result = DeckSerializer.fromSections(sections, true);
+        Deck result = DeckSerializer.fromSections(sections);
 
         if (moveWronglyNamedDecks) {
             adjustFileLocation(file, result);
diff --git a/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java b/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java
index 80af33dfade..e0d4e0e65ce 100644
--- a/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java
+++ b/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java
@@ -171,7 +171,7 @@ public class OldDeckParser {
 
             final List<String> fileLines = FileUtil.readFile(f);
             final Map<String, List<String>> sections = FileSection.parseSections(fileLines);
-            final DeckFileHeader dh = DeckSerializer.readDeckMetadata(sections, false);
+            final DeckFileHeader dh = DeckSerializer.readDeckMetadata(sections);
             String name = dh.getName();
 
             if (dh.isCustomPool()) {