From a3fb6de6b33bdb21d910e44d7ceca50c0b164311 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 25 Jan 2014 01:02:51 +0000
Subject: [PATCH] Fix so decks inside subfolders support being deleted

---
 .../gui/deckeditor/controllers/DeckController.java    | 11 -----------
 .../forge/gui/toolbox/itemmanager/DeckManager.java    | 11 +++--------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
index b2bd7307387..6fff7e94280 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
@@ -201,17 +201,6 @@ public class DeckController<T extends DeckBase> {
         return this.saved;
     }
 
-    /**
-     * Delete.
-     */
-    public void delete() {
-        if (StringUtils.isNotBlank(this.model.getName())) {
-            this.currentFolder.delete(this.model.getName());
-        }
-        this.modelInStorage = false;
-        this.newModel();
-    }
-
     /**
      * File exists.
      *
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
index ee91834517a..092dc78b8e8 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
@@ -39,7 +39,6 @@ import forge.gui.toolbox.itemmanager.views.ItemColumn;
 import forge.gui.toolbox.itemmanager.views.ItemListView;
 import forge.gui.toolbox.itemmanager.views.SColumnUtil;
 import forge.item.InventoryItem;
-import forge.model.CardCollections;
 import forge.quest.QuestWorld;
 
 /** 
@@ -261,25 +260,21 @@ public final class DeckManager extends ItemManager<DeckProxy> {
             return false;
         }
 
-        
         // consider using deck proxy's method to delete deck
-        final CardCollections deckManager = Singletons.getModel().getDecks();
         switch(this.gametype) {
             case Constructed:
-                deckManager.getConstructed().delete(deck.getName()); break;
             case Draft:
-                deckManager.getDraft().delete(deck.getName()); break;
             case Sealed:
-                deckManager.getSealed().delete(deck.getName()); break;
+                deck.deleteFromStorage();
+                break;
             case Quest:
-                Singletons.getModel().getQuest().getMyDecks().delete(deck.getName());
+                deck.deleteFromStorage();
                 Singletons.getModel().getQuest().save();
                 break;
             default:
                 throw new UnsupportedOperationException("Delete not implemneted for game type = " + gametype.toString());
         }
 
-
         this.removeItem(deck, 1);
 
         if (this.cmdDelete != null) {