From 112819d46414c70f67fab26e03da48c0b770a6fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 17 Sep 2016 15:09:40 +0200
Subject: [PATCH] Multiname suffixes refresh method renamed

---
 .../ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java | 8 ++++++--
 .../flash/abc/avm2/parser/pcode/ASM3Parser.java           | 2 +-
 .../flash/gui/abc/SlotConstTraitDetailPanel.java          | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index ab1f30808..61dc33dd8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -693,7 +693,7 @@ public class ABC {
             SWFDecompilerPlugin.fireMethodBodyParsed(this, mb, swf);
         }
 
-        markSameContextMultinames();
+        refreshMultinameNamespaceSuffixes();
         getMethodIndexing();
 
         SWFDecompilerPlugin.fireAbcParsed(this, swf);
@@ -1117,7 +1117,11 @@ public class ABC {
         return ret;
     }
 
-    public void markSameContextMultinames() {
+    /**
+     * Appends namespace (#123) suffix to multinames which collide with each
+     * other. For example same name consts/vars/methods or same class names.
+     */
+    public void refreshMultinameNamespaceSuffixes() {
 
         //Reset
         for (int multinameIndex = 1; multinameIndex < constants.getMultinameCount(); multinameIndex++) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/ASM3Parser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/ASM3Parser.java
index 9a5a3dc97..3326b34cd 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/ASM3Parser.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/ASM3Parser.java
@@ -1129,7 +1129,7 @@ public class ASM3Parser {
                 info.optional[i] = optional.get(i);
             }
         }
-        abc.markSameContextMultinames();
+        abc.refreshMultinameNamespaceSuffixes();
         return code;
     }
 }
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
index 51ca08af5..2d3e306aa 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
@@ -123,7 +123,7 @@ public class SlotConstTraitDetailPanel extends JPanel implements TraitDetail {
             return false;
         }
 
-        abc.markSameContextMultinames();
+        abc.refreshMultinameNamespaceSuffixes();
         ((Tag) abc.parentTag).setModified(true);
         return true;
     }