From 0896f456152d60f1844647bacb0c0026d8251a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 1 Nov 2022 21:51:18 +0100
Subject: [PATCH] Taglist edit fix 2

---
 .../jpexs/decompiler/flash/gui/FontPanel.java    | 16 ++++++++--------
 .../jpexs/decompiler/flash/gui/abc/ABCPanel.java |  9 +++++----
 .../decompiler/flash/gui/action/ActionPanel.java |  7 ++++---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
index 53c3a9508..4cfb5c3f3 100644
--- a/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
@@ -158,7 +158,7 @@ public class FontPanel extends JPanel {
     }
 
     private void fontAddChars(FontTag ft, Set<Integer> selChars, Font font) {
-        FontTag f = (FontTag) mainPanel.tagTree.getCurrentTreeItem();
+        FontTag f = (FontTag) mainPanel.getCurrentTree().getCurrentTreeItem();
         String oldchars = f.getCharacters();
         for (int ic : selChars) {
             char c = (char) ic;
@@ -228,7 +228,7 @@ public class FontPanel extends JPanel {
     }
 
     private void fontRemoveChars(FontTag ft, Set<Integer> selChars) {
-        FontTag f = (FontTag) mainPanel.tagTree.getCurrentTreeItem();
+        FontTag f = (FontTag) mainPanel.getCurrentTree().getCurrentTreeItem();
 
         for (int ic : selChars) {
             char c = (char) ic;
@@ -563,7 +563,7 @@ public class FontPanel extends JPanel {
     private void fontAddCharsButtonActionPerformed(ActionEvent evt) {
         String newchars = fontAddCharactersField.getText();
 
-        TreeItem item = mainPanel.tagTree.getCurrentTreeItem();
+        TreeItem item = mainPanel.getCurrentTree().getCurrentTreeItem();
         if (item instanceof FontTag) {
             FontTag ft = (FontTag) item;
             Set<Integer> selChars = new TreeSet<>();
@@ -582,7 +582,7 @@ public class FontPanel extends JPanel {
     private void fontRemoveCharsButtonActionPerformed(ActionEvent evt) {
         String newchars = fontAddCharactersField.getText();
 
-        TreeItem item = mainPanel.tagTree.getCurrentTreeItem();
+        TreeItem item = mainPanel.getCurrentTree().getCurrentTreeItem();
         if (item instanceof FontTag) {
             FontTag ft = (FontTag) item;
             Set<Integer> selChars = new TreeSet<>();
@@ -599,7 +599,7 @@ public class FontPanel extends JPanel {
     }
 
     private void fontEmbedButtonActionPerformed(ActionEvent evt) {
-        TreeItem item = mainPanel.tagTree.getCurrentTreeItem();
+        TreeItem item = mainPanel.getCurrentTree().getCurrentTreeItem();
         if (item instanceof FontTag) {
             FontTag ft = (FontTag) item;
             FontEmbedDialog fed = new FontEmbedDialog(Main.getDefaultDialogsOwner(), ft.hasLayout() || ft.getCharacterCount() == 0, (FontFace) fontFaceSelection.getSelectedItem(), fontAddCharactersField.getText());
@@ -641,7 +641,7 @@ public class FontPanel extends JPanel {
         if (!allowSave) {
             return;
         }
-        TreeItem item = mainPanel.tagTree.getCurrentTreeItem();
+        TreeItem item = mainPanel.getCurrentTree().getCurrentTreeItem();
         if (item instanceof FontTag) {
             FontTag f = (FontTag) item;
             SWF swf = f.getSwf();
@@ -705,7 +705,7 @@ public class FontPanel extends JPanel {
 
         }
 
-        mainPanel.tagTree.repaint();
+        mainPanel.getCurrentTree().repaint();
         fontTag.setModified(true);
         setEditable(false);
     }
@@ -730,7 +730,7 @@ public class FontPanel extends JPanel {
     }
 
     private void importTTFButtonActionPerformed(ActionEvent evt) {
-        TreeItem item = mainPanel.tagTree.getCurrentTreeItem();
+        TreeItem item = mainPanel.getCurrentTree().getCurrentTreeItem();
         if (item instanceof FontTag) {
             FontTag ft = (FontTag) item;
 
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index fcab78552..f4b10a86e 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -69,6 +69,7 @@ import com.jpexs.decompiler.flash.gui.abc.tablemodels.StringTableModel;
 import com.jpexs.decompiler.flash.gui.abc.tablemodels.UIntTableModel;
 import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.editor.LinkHandler;
+import com.jpexs.decompiler.flash.gui.tagtree.AbstractTagTreeModel;
 import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
@@ -1321,7 +1322,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
     public void hilightScript(SWF swf, String name) {
         View.checkAccess();
 
-        TagTreeModel ttm = (TagTreeModel) mainPanel.tagTree.getModel();
+        TagTreeModel ttm = (TagTreeModel) mainPanel.getCurrentTree().getModel();
         TreeItem scriptsNode = ttm.getScriptsNode(swf);
         if (scriptsNode instanceof ClassesListTreeModel) {
             ClassesListTreeModel clModel = (ClassesListTreeModel) scriptsNode;
@@ -1349,15 +1350,15 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
     public void hilightScript(ScriptPack pack) {
         View.checkAccess();
 
-        TagTreeModel ttm = (TagTreeModel) mainPanel.tagTree.getModel();
+        AbstractTagTreeModel ttm = mainPanel.getCurrentTree().getModel();
         TreePath tp = ttm.getTreePath(pack);
         if (tp == null) {
             mainPanel.closeTagTreeSearch();
             tp = ttm.getTreePath(pack);
         }
 
-        mainPanel.tagTree.setSelectionPath(tp);
-        mainPanel.tagTree.scrollPathToVisible(tp);
+        mainPanel.getCurrentTree().setSelectionPath(tp);
+        mainPanel.getCurrentTree().scrollPathToVisible(tp);
     }
 
     @Override
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index d173e5417..68813d383 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -50,6 +50,7 @@ import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.controls.NoneSelectedButtonGroup;
 import com.jpexs.decompiler.flash.gui.editor.DebuggableEditorPane;
 import com.jpexs.decompiler.flash.gui.editor.LinkHandler;
+import com.jpexs.decompiler.flash.gui.tagtree.AbstractTagTreeModel;
 import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel;
 import com.jpexs.decompiler.flash.helpers.HighlightedText;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
@@ -1136,10 +1137,10 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
 
         addScriptListener(onScriptComplete);
 
-        TagTreeModel ttm = (TagTreeModel) mainPanel.tagTree.getModel();
+        AbstractTagTreeModel ttm = mainPanel.getCurrentTree().getModel();
         TreePath tp = ttm.getTreePath(result.getSrc());
-        mainPanel.tagTree.setSelectionPath(tp);
-        mainPanel.tagTree.scrollPathToVisible(tp);
+        mainPanel.getCurrentTree().setSelectionPath(tp);
+        mainPanel.getCurrentTree().scrollPathToVisible(tp);
 
     }