From dced2be446dbaf1ece35cb0458f679a83612355c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 13 Mar 2021 22:50:29 +0100
Subject: [PATCH] AS3 - Remove trait which is outside class

---
 CHANGELOG.md                                  |  4 ++
 .../jpexs/decompiler/flash/gui/MainPanel.java | 22 +++++++
 .../decompiler/flash/gui/abc/ABCPanel.java    | 62 ++++++++++++++-----
 3 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b174b916d..ceeba2ad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+### Added
+- AS3 - Remove trait which is outside class
+
 ## [14.2.1] - 2021-03-13
 ### Added
 - Placeobject display and edit - raw editor on right side
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 6a8a753a4..5b47c7c32 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -2837,6 +2837,28 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
         refreshTree(new SWF[0]);
     }
 
+    public void treeOperation(Runnable runnable) {
+        TreeItem treeItem = tagTree.getCurrentTreeItem();
+        tagTree.clearSelection();
+        runnable.run();
+        clear();
+        showCard(CARDEMPTYPANEL);
+
+        tagTree.updateSwfs(new SWF[0]);
+
+        if (treeItem != null) {
+            SWF swf = treeItem.getSwf();
+            if (swf != null) {
+                SWF treeItemSwf = swf.getRootSwf();
+                if (this.swfs.contains(treeItemSwf.swfList)) {
+                    setTagTreeSelectedNode(treeItem);
+                }
+            }
+        }
+
+        reload(true);
+    }
+
     public void refreshTree(SWF swf) {
         refreshTree(new SWF[]{swf});
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index f006a92f9..db8256435 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -34,6 +34,7 @@ import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.ValueKind;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
 import com.jpexs.decompiler.flash.abc.types.traits.Traits;
@@ -1530,33 +1531,64 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
             return;
         }
 
+        boolean scriptTraitsUsed = false;
         Traits traits = null;
         int traitIndex = -1;
-        if (classIndex < 0) {
-            return;
-        }
-        Traits staticTraits = abc.class_info.get(classIndex).static_traits;
-        Traits instanceTraits = abc.instance_info.get(classIndex).instance_traits;
-        if (traitId >= 0 && traitId < abc.class_info.get(classIndex).static_traits.traits.size()) {
+        if (traitId == GraphTextWriter.TRAIT_UNKNOWN && classIndex >= 0) {
+            traits = abc.script_info.get(decompiledTextArea.getScriptLeaf().scriptIndex).traits;
+            for (int i = 0; i < traits.traits.size(); i++) {
+                if (traits.traits.get(i) instanceof TraitClass) {
+                    TraitClass tc = (TraitClass) traits.traits.get(i);
+                    if (tc.class_info == classIndex) {
+                        traitIndex = i;
+                        break;
+                    }
+                }
+            }
+            scriptTraitsUsed = true;
+        } else if (classIndex < 0) {
+            traits = abc.script_info.get(decompiledTextArea.getScriptLeaf().scriptIndex).traits;
             traitIndex = traitId;
-            traits = staticTraits;
+            scriptTraitsUsed = true;
         } else {
-            if (traitId >= 0 && traitId < staticTraits.traits.size() + instanceTraits.traits.size()) {
-                traitIndex = traitId - staticTraits.traits.size();
-                traits = instanceTraits;
+            Traits staticTraits = abc.class_info.get(classIndex).static_traits;
+            Traits instanceTraits = abc.instance_info.get(classIndex).instance_traits;
+            if (traitId >= 0 && traitId < abc.class_info.get(classIndex).static_traits.traits.size()) {
+                traitIndex = traitId;
+                traits = staticTraits;
             } else {
-                traits = null;
+                if (traitId >= 0 && traitId < staticTraits.traits.size() + instanceTraits.traits.size()) {
+                    traitIndex = traitId - staticTraits.traits.size();
+                    traits = instanceTraits;
+                } else {
+                    traits = null;
+                }
             }
         }
 
-        if (traits == null) {
+        if (traits == null || traitIndex < 0) {
             return;
         }
 
         if (View.showConfirmDialog(null, AppStrings.translate("message.confirm.removetrait"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
-            traits.traits.remove(traitIndex);
-            ((Tag) abc.parentTag).setModified(true);
-            reload();
+
+            if (scriptTraitsUsed) {
+                final int fTraitIndex = traitIndex;
+                final Traits fTraits = traits;
+                Main.getMainFrame().getPanel().treeOperation(new Runnable() {
+                    @Override
+                    public void run() {
+                        ((Tag) abc.parentTag).getSwf().clearScriptCache();
+                        fTraits.traits.remove(fTraitIndex);
+                        ((Tag) abc.parentTag).setModified(true);
+                    }
+                });
+            } else {
+                traits.traits.remove(traitIndex);
+                ((Tag) abc.parentTag).setModified(true);
+                reload();
+            }
+
         }
     }