external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix so decks inside subfolders support being deleted

Browse Source
This commit is contained in:
drdev
2014-01-25 01:02:51 +00:00
parent 5252cca5c5
commit a3fb6de6b3
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java
View File

@@ -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.
*

11
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
View File

@@ -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) {