From 29ed2cc266307af99af42a75922e9d9fd7847db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 29 Jan 2023 22:11:51 +0100
Subject: [PATCH] Fixed AS3 - Select the trait after adding new Fixed #1955 AS3
 - Exception during removing trait

---
 CHANGELOG.md                                     |  3 +++
 .../jpexs/decompiler/flash/gui/abc/ABCPanel.java | 16 ++++++++++++----
 .../decompiler/flash/gui/abc/TraitsListItem.java | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 255571382..df90dc60f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ All notable changes to this project will be documented in this file.
 - [#1944] Scroll position not retained on Ctrl+click in the tag tree
 - [#1940] AS3 decompilation - wrong assignment
 - AS3 - incorrect switching P-code causing empty text
+- AS3 - Select the trait after adding new
+- [#1955] AS3 - Exception during removing trait
 
 ## [18.3.3] - 2023-01-22
 ### Added
@@ -2931,6 +2933,7 @@ All notable changes to this project will be documented in this file.
 [#1954]: https://www.free-decompiler.com/flash/issues/1954
 [#1944]: https://www.free-decompiler.com/flash/issues/1944
 [#1940]: https://www.free-decompiler.com/flash/issues/1940
+[#1955]: https://www.free-decompiler.com/flash/issues/1955
 [#1913]: https://www.free-decompiler.com/flash/issues/1913
 [#1894]: https://www.free-decompiler.com/flash/issues/1894
 [#1801]: https://www.free-decompiler.com/flash/issues/1801
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 172a790a8..413c52736 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -122,6 +122,7 @@ import java.util.logging.Logger;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComboBox;
@@ -1781,7 +1782,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         }
 
         if (ViewMessages.showConfirmDialog(this, AppStrings.translate("message.confirm.removetrait"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
-
+            navigator.setModel(new DefaultListModel<>());
             if (scriptTraitsUsed) {
                 final int fTraitIndex = traitIndex;
                 final Traits fTraits = traits;
@@ -1802,7 +1803,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 ((Tag) abc.parentTag).setModified(true);
                 reload();
             }
-
+            
         }
     }
 
@@ -1857,6 +1858,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 }
             }
         } while (again);
+        navigator.setModel(new DefaultListModel<>());            
         switch (kind) {
             case Trait.TRAIT_GETTER:
             case Trait.TRAIT_SETTER:
@@ -1906,8 +1908,14 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 abc.script_info.get(scriptIndex).setModified(true);
             }
             ((Tag) abc.parentTag).setModified(true);
-            reload();
-            decompiledTextArea.gotoTrait(traitId);
+            decompiledTextArea.addScriptListener(new Runnable() {
+                @Override
+                public void run() {
+                    decompiledTextArea.gotoTrait(traitId);
+                    decompiledTextArea.removeScriptListener(this);
+                }
+            });
+            reload();            
         }
     }
 
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java b/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
index 82b280936..68e512f02 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
@@ -20,12 +20,14 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.ConvertData;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitType;
+import com.jpexs.decompiler.flash.abc.types.traits.Traits;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.search.ABCSearchResult;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -99,14 +101,22 @@ public class TraitsListItem {
                 }
             } else if (isStatic) {
                 ConvertData convertData = new ConvertData();
-                Trait trait = abc.class_info.get(classIndex).static_traits.traits.get(index);
+                List<Trait> traits = abc.class_info.get(classIndex).static_traits.traits;
+                if (index >= traits.size()) {
+                    return "";
+                }
+                Trait trait = traits.get(index);
                 trait.convertHeader(null, convertData, "", abc, true, ScriptExportMode.AS, scriptIndex, classIndex, new NulWriter(), new ArrayList<>(), false);
                 HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), false);
                 trait.toStringHeader(null, convertData, "", abc, true, ScriptExportMode.AS, scriptIndex, classIndex, writer, new ArrayList<>(), false);
                 s = writer.toString();
             } else {
                 ConvertData convertData = new ConvertData();
-                Trait trait = abc.instance_info.get(classIndex).instance_traits.traits.get(index);
+                List<Trait> traits = abc.instance_info.get(classIndex).instance_traits.traits;                
+                if (index >= traits.size()) {
+                    return "";
+                }
+                Trait trait = traits.get(index);
                 trait.convertHeader(null, convertData, "", abc, false, ScriptExportMode.AS, scriptIndex, classIndex, new NulWriter(), new ArrayList<>(), false);
                 HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), false);
                 trait.toStringHeader(null, convertData, "", abc, false, ScriptExportMode.AS, scriptIndex, classIndex, writer, new ArrayList<>(), false);