From 0ad00a81ee63d5b27381b6818bf7a4729ddd66eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 20 Nov 2022 14:55:58 +0100 Subject: [PATCH] Move ABC up or down --- src/com/jpexs/decompiler/flash/gui/MainPanel.java | 14 +++++++------- .../flash/gui/tagtree/TagTreeContextMenu.java | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index baea02f28..b5b62e024 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -456,20 +456,20 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se } public void moveSwfListUpDown(TreeItem item, boolean up) { - OpenableList swfList = null; - if (item instanceof SWF) { - SWF swf = (SWF) item; - if (swf.openableList != null && !swf.openableList.isBundle() && swf.openableList.size() == 1) { - swfList = swf.openableList; + OpenableList openableList = null; + if (item instanceof Openable) { + Openable openable = (Openable) item; + if (openable.getOpenableList() != null && !openable.getOpenableList().isBundle() && openable.getOpenableList().size() == 1) { + openableList = openable.getOpenableList(); } else { return; } } else if (item instanceof OpenableList) { - swfList = (OpenableList) item; + openableList = (OpenableList) item; } else { return; } - int index = openables.indexOf(swfList); + int index = openables.indexOf(openableList); List> expandedTagTree = View.getExpandedNodes(tagTree); List> expandedTagListTree = View.getExpandedNodes(tagListTree); diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java index 4370555d8..dba245922 100644 --- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java @@ -942,9 +942,9 @@ public class TagTreeContextMenu extends JPopupMenu { moveUpMenuItem.setVisible(true); moveDownMenuItem.setVisible(true); } - if (firstItem instanceof SWF) { - SWF firstSwf = (SWF) firstItem; - if (firstSwf.openableList != null && !firstSwf.openableList.isBundle() && firstSwf.openableList.size() == 1) { + if (firstItem instanceof Openable) { + Openable firstOpenable = (Openable) firstItem; + if (firstOpenable.getOpenableList() != null && !firstOpenable.getOpenableList().isBundle() && firstOpenable.getOpenableList().size() == 1) { moveUpMenuItem.setVisible(true); moveDownMenuItem.setVisible(true); } @@ -3034,7 +3034,7 @@ public class TagTreeContextMenu extends JPopupMenu { } public void moveUpDown(TreeItem item, boolean up) { - if ((item instanceof SWF) || (item instanceof OpenableList)) { + if ((item instanceof Openable) || (item instanceof OpenableList)) { mainPanel.moveSwfListUpDown(item, up); return; }