Support Import, Open, New deck, Save As

in all deck editors with finite catalog
This commit is contained in:
NikolayHD
2018-08-29 01:13:43 +03:00
parent db7ab85f26
commit 66e52cbd6a
18 changed files with 300 additions and 220 deletions

View File

@@ -1490,15 +1490,6 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
modelPath = "";
}
public Deck getDeck() {
if (model == null) { return null; }
if (model instanceof Deck) {
return (Deck) model;
}
return ((DeckGroup) model).getHumanDeck();
}
public T getModel() {
return model;
}
@@ -1537,7 +1528,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
modelPath = "";
setSaved(true);
}
editor.setDeck(getDeck());
editor.setDeck(model.getHumanDeck());
}
private boolean isModelInSyncWithFolder() {
@@ -1661,7 +1652,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
default:
break;
}
editor.setDeck(getDeck());
editor.setDeck(model.getHumanDeck());
if (editor.saveHandler != null) {
editor.saveHandler.handleEvent(new FEvent(editor, FEventType.SAVE));
}