From 34b2d6be2a93c6a9084e0c9e5836f3e11b6bab0b Mon Sep 17 00:00:00 2001 From: nicol Date: Sun, 20 Oct 2024 12:04:03 +0200 Subject: [PATCH] updates --- .../org/magic/gui/components/deck/DeckTree.java | 14 ++++++-------- src/main/resources/data/sets_codeAliases.json | 6 +++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/magic/gui/components/deck/DeckTree.java b/src/main/java/org/magic/gui/components/deck/DeckTree.java index 25ff7e3f6..e52121cb2 100644 --- a/src/main/java/org/magic/gui/components/deck/DeckTree.java +++ b/src/main/java/org/magic/gui/components/deck/DeckTree.java @@ -12,6 +12,8 @@ import org.magic.gui.renderer.DeckTreeCellRenderer; public class DeckTree extends JTree{ + + private static final long serialVersionUID = 1L; private DefaultTreeModel model; private DefaultMutableTreeNode root; private DefaultMutableTreeNode creatureNode = new DefaultMutableTreeNode("Creatures"); @@ -48,8 +50,8 @@ private void expandAll(TreePath parent) { TreeNode node = (TreeNode) parent.getLastPathComponent(); if (node.getChildCount() >= 0) { for (Enumeratione = node.children(); e.hasMoreElements();) { - TreeNode n = e.nextElement(); - TreePath path = parent.pathByAddingChild(n); + var n = e.nextElement(); + var path = parent.pathByAddingChild(n); expandAll(path); } } @@ -64,7 +66,8 @@ private void initTree() { landsNode.removeAllChildren(); spellsNode.removeAllChildren(); sideNode.removeAllChildren(); - + + if (selectedDeck != null) { for (var mc : selectedDeck.getMain().entrySet()) { if (mc.getKey().isCreature() && !mc.getKey().isArtifact()) @@ -88,11 +91,6 @@ else if (mc.getKey().isPlaneswalker()) } } - public void enableSelection() { - // TODO Auto-generated method stub - - } - } diff --git a/src/main/resources/data/sets_codeAliases.json b/src/main/resources/data/sets_codeAliases.json index 830363f42..3217567d8 100644 --- a/src/main/resources/data/sets_codeAliases.json +++ b/src/main/resources/data/sets_codeAliases.json @@ -1,5 +1,9 @@ { - + + "YBLB": [ + "YDSK" + + ], "DSK": [ "ADSK" ],