From 73f3bb10cc490eff78dcf1af4a8832d2a106ce0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 6 Apr 2015 09:09:17 +0200
Subject: [PATCH] Additional character info tags now placed under the character
 in the tree Few icons for tags (metadata,fileattributes,setbackground,place
 and remove tags)

---
 .../src/com/jpexs/decompiler/flash/SWF.java   |  12 +++--
 .../flash/tags/CSMTextSettingsTag.java        |   8 ++-
 .../flash/tags/DefineButtonCxformTag.java     |   8 ++-
 .../flash/tags/DefineButtonSoundTag.java      |   3 +-
 .../flash/tags/DefineFontAlignZonesTag.java   |   8 ++-
 .../flash/tags/DefineFontInfo2Tag.java        |   8 ++-
 .../flash/tags/DefineFontInfoTag.java         |   8 ++-
 .../flash/tags/DefineFontNameTag.java         |   8 ++-
 .../flash/tags/DefineScalingGridTag.java      |   8 ++-
 .../flash/tags/DoInitActionTag.java           |   9 ++--
 .../flash/tags/RemoveObjectTag.java           |   2 +-
 .../flash/tags/SoundStreamHead2Tag.java       |   3 +-
 .../flash/tags/SoundStreamHeadTag.java        |   5 +-
 .../flash/tags/base/CharacterIdTag.java       |  47 ++----------------
 .../flash/tags/base/CharacterTag.java         |  17 ++++++-
 .../flash/tags/base/PlaceObjectTypeTag.java   |   3 +-
 .../decompiler/flash/timeline/Timeline.java   |   3 +-
 .../decompiler/flash/xfl/XFLConverter.java    |   5 +-
 .../decompiler/flash/gui/TreeNodeType.java    |   5 ++
 .../flash/gui/graphics/fileattributes16.png   | Bin 0 -> 732 bytes
 .../flash/gui/graphics/metadata16.png         | Bin 0 -> 568 bytes
 .../flash/gui/graphics/placeobject16.png      | Bin 0 -> 698 bytes
 .../flash/gui/graphics/removeobject16.png     | Bin 0 -> 695 bytes
 .../gui/graphics/setbackgroundcolor16.png     | Bin 0 -> 805 bytes
 .../decompiler/flash/gui/tagtree/TagTree.java |  17 +++++++
 .../flash/gui/tagtree/TagTreeModel.java       |  42 +++++++++++++++-
 .../flash/gui/tagtree/TagTreeSwfInfo.java     |   1 +
 27 files changed, 161 insertions(+), 69 deletions(-)
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/fileattributes16.png
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/metadata16.png
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/placeobject16.png
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/removeobject16.png
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/setbackgroundcolor16.png

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 36dfc7334..bbf3f650c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -352,7 +352,7 @@ public final class SWF implements SWFContainerItem, Timelined {
 
         di.getChildInfos().clear();
     }
-
+       
     public Map<Integer, CharacterTag> getCharacters() {
         if (characters == null) {
             synchronized (this) {
@@ -857,9 +857,11 @@ public final class SWF implements SWFContainerItem, Timelined {
         this.tags = tags;
         if (!checkOnly) {
             checkInvalidSprites();
+            Map<Integer, CharacterTag> chars = new HashMap<>();
+            parseCharacters(tags, chars);
+            characters = chars;
             assignExportNamesToSymbols();
             assignClassesToSymbols();
-
             SWFDecompilerPlugin.fireSwfParsed(this);
         } else {
             boolean hasNonUnknownTag = false;
@@ -950,8 +952,8 @@ public final class SWF implements SWFContainerItem, Timelined {
             }
         }
         for (Tag t : tags) {
-            if (t instanceof CharacterIdTag) {
-                CharacterIdTag ct = (CharacterIdTag) t;
+            if (t instanceof CharacterTag) {
+                CharacterTag ct = (CharacterTag) t;
                 if (exportNames.containsKey(ct.getCharacterId())) {
                     ct.setExportName(exportNames.get(ct.getCharacterId()));
                 }
@@ -1939,7 +1941,7 @@ public final class SWF implements SWFContainerItem, Timelined {
                 cnt++;
                 informListeners("rename", "class " + cnt + "/" + classCount);
                 DoInitActionTag dia = (DoInitActionTag) t;
-                String exportName = dia.getExportName();
+                String exportName =  characters.containsKey(dia.spriteId)?characters.get(dia.spriteId).getExportName():"_unk_";
                 final String pkgPrefix = "__Packages.";
                 String[] classNameParts = null;
                 if ((exportName != null) && exportName.startsWith(pkgPrefix)) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java
index a84035953..55d54dbcd 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.Reserved;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -32,7 +33,7 @@ import java.io.OutputStream;
  *
  * @author JPEXS
  */
-public class CSMTextSettingsTag extends Tag {
+public class CSMTextSettingsTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int textID;
@@ -114,4 +115,9 @@ public class CSMTextSettingsTag extends Tag {
         sharpness = sis.readFLOAT("sharpness"); //F32 = FLOAT
         reserved2 = sis.readUI8("reserved2"); //reserved
     }
+
+    @Override
+    public int getCharacterId() {
+        return textID;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java
index 8e91d3ca8..50d3811c3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.CXFORM;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -32,7 +33,7 @@ import java.io.OutputStream;
  *
  * @author JPEXS
  */
-public class DefineButtonCxformTag extends Tag {
+public class DefineButtonCxformTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int buttonId;
@@ -87,4 +88,9 @@ public class DefineButtonCxformTag extends Tag {
         buttonId = sis.readUI16("buttonId");
         buttonColorTransform = sis.readCXFORM("buttonColorTransform");
     }
+    
+    @Override
+    public int getCharacterId() {
+        return buttonId;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java
index 59a028905..733c8323d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
+import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.SOUNDINFO;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -33,7 +34,7 @@ import java.io.OutputStream;
  *
  * @author JPEXS
  */
-public class DefineButtonSoundTag extends CharacterIdTag {
+public class DefineButtonSoundTag extends CharacterTag {
 
     @SWFType(BasicType.UI16)
     public int buttonId;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java
index 431989b99..6157eb9b9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.ZONERECORD;
 import com.jpexs.decompiler.flash.types.annotations.Reserved;
@@ -31,7 +32,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DefineFontAlignZonesTag extends Tag {
+public class DefineFontAlignZonesTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int fontID;
@@ -97,4 +98,9 @@ public class DefineFontAlignZonesTag extends Tag {
         }
         return baos.toByteArray();
     }
+    
+    @Override
+    public int getCharacterId() {
+        return fontID;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
index 03c2c4fa8..e7bc53774 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.LANGCODE;
 import com.jpexs.decompiler.flash.types.annotations.Reserved;
@@ -36,7 +37,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public class DefineFontInfo2Tag extends Tag {
+public class DefineFontInfo2Tag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int fontID;
@@ -145,4 +146,9 @@ public class DefineFontInfo2Tag extends Tag {
             codeTable.add(sis.readUI16("code"));
         }
     }
+    
+    @Override
+    public int getCharacterId() {
+        return fontID;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
index b6036f8e3..2dd08c224 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.Reserved;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -35,7 +36,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public class DefineFontInfoTag extends Tag {
+public class DefineFontInfoTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int fontId;
@@ -146,4 +147,9 @@ public class DefineFontInfoTag extends Tag {
             }
         }
     }
+    
+    @Override
+    public int getCharacterId() {
+        return fontId;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java
index 9eae64a46..7c9dadf7a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
 import com.jpexs.helpers.ByteArrayRange;
@@ -26,7 +27,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-public class DefineFontNameTag extends Tag {
+public class DefineFontNameTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int fontId;
@@ -79,4 +80,9 @@ public class DefineFontNameTag extends Tag {
         }
         return baos.toByteArray();
     }
+    
+    @Override
+    public int getCharacterId() {
+        return fontId;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
index 206ba9bdf..6c22cf3fb 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.tags;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.RECT;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -30,7 +31,7 @@ import java.io.OutputStream;
 /**
  * @author JPEXS
  */
-public class DefineScalingGridTag extends Tag {
+public class DefineScalingGridTag extends Tag implements CharacterIdTag {
 
     @SWFType(BasicType.UI16)
     public int characterId;
@@ -78,4 +79,9 @@ public class DefineScalingGridTag extends Tag {
         }
         return baos.toByteArray();
     }
+    
+    @Override
+    public int getCharacterId() {
+        return characterId;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
index 202378bb1..c97933e02 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
+import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.HideInRawEdit;
 import com.jpexs.decompiler.flash.types.annotations.SWFType;
@@ -39,7 +40,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class DoInitActionTag extends CharacterIdTag implements ASMSource {
+public class DoInitActionTag extends Tag implements CharacterIdTag,ASMSource {
 
     /**
      * Identifier of Sprite
@@ -193,7 +194,8 @@ public class DoInitActionTag extends CharacterIdTag implements ASMSource {
 
     @Override
     public String getExportFileName() {
-        String expName = getExportName();
+        CharacterTag sprite=swf.getCharacter(spriteId);
+        String expName = sprite!=null?sprite.getExportName():null;
         if ((expName == null) || expName.isEmpty()) {
             return super.getExportFileName();
         }
@@ -208,7 +210,8 @@ public class DoInitActionTag extends CharacterIdTag implements ASMSource {
 
     @Override
     public String getName() {
-        String expName = getExportName();
+        CharacterTag sprite=swf.getCharacter(spriteId);
+        String expName = sprite!=null?sprite.getExportName():null;
         if ((expName == null) || expName.isEmpty()) {
             return super.getName();
         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java
index adcff4344..71cde6bdd 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java
@@ -33,7 +33,7 @@ import java.io.OutputStream;
  *
  * @author JPEXS
  */
-public class RemoveObjectTag extends CharacterIdTag implements RemoveTag {
+public class RemoveObjectTag extends Tag implements CharacterIdTag,RemoveTag {
 
     /**
      * ID of character to place
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java
index 71aaef8b0..dd8feb080 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
+import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.Conditional;
@@ -40,7 +41,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public class SoundStreamHead2Tag extends CharacterIdTag implements SoundStreamHeadTypeTag {
+public class SoundStreamHead2Tag extends CharacterTag implements SoundStreamHeadTypeTag {
 
     @Reserved
     @SWFType(value = BasicType.UB, count = 4)
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java
index 541902a8f..b0eb10b78 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
+import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
 import com.jpexs.decompiler.flash.types.BasicType;
 import com.jpexs.decompiler.flash.types.annotations.Conditional;
@@ -40,7 +41,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public class SoundStreamHeadTag extends CharacterIdTag implements SoundStreamHeadTypeTag {
+public class SoundStreamHeadTag extends CharacterTag implements SoundStreamHeadTypeTag {
 
     @Reserved
     @SWFType(value = BasicType.UB, count = 4)
@@ -261,4 +262,6 @@ public class SoundStreamHeadTag extends CharacterIdTag implements SoundStreamHea
         final int[] rateMap = {5512, 11025, 22050, 44100};
         return new SoundFormat(getSoundFormatId(), rateMap[getSoundRate()], getSoundType());
     }
+
+   
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
index e2af5e4b9..399975511 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
@@ -24,49 +24,10 @@ import com.jpexs.helpers.ByteArrayRange;
  *
  * @author JPEXS
  */
-public abstract class CharacterIdTag extends Tag {
+public interface CharacterIdTag {
 
-    public CharacterIdTag(SWF swf, int id, String name, ByteArrayRange data) {
-        super(swf, id, name, data);
-    }
+    
 
-    public abstract int getCharacterId();
-
-    protected String exportName;
-
-    public void setExportName(String exportName) {
-        if ("".equals(exportName)) {
-            exportName = null;
-        }
-        this.exportName = exportName;
-    }
-
-    @Override
-    public String getName() {
-        String nameAppend = "";
-        if (exportName != null) {
-            nameAppend = ": " + exportName;
-        }
-        if (getCharacterId() != -1) {
-            return super.getName() + " (" + getCharacterId() + nameAppend + ")";
-        }
-        if (!nameAppend.isEmpty()) {
-            return super.getName() + " (" + nameAppend + ")";
-        }
-        return super.getName();
-    }
-
-    @Override
-    public String getExportFileName() {
-        String result = super.getExportFileName() + "_" + getCharacterId();
-        return result + (exportName != null ? "_" + exportName : "");
-    }
-
-    public String getCharacterExportFileName() {
-        return getCharacterId() + (exportName != null ? "_" + exportName : "");
-    }
-
-    public String getExportName() {
-        return exportName;
-    }
+    public int getCharacterId();
+      
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
index ce8f7d2d6..81c8e4785 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
@@ -17,13 +17,14 @@
 package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.helpers.ByteArrayRange;
 
 /**
  *
  * @author JPEXS
  */
-public abstract class CharacterTag extends CharacterIdTag {
+public abstract class CharacterTag extends Tag implements CharacterIdTag {
 
     protected String className;
 
@@ -57,8 +58,20 @@ public abstract class CharacterTag extends CharacterIdTag {
         return result + (className != null ? "_" + className : "");
     }
 
-    @Override
     public String getCharacterExportFileName() {
         return getCharacterId() + (exportName != null ? "_" + exportName : "") + (className != null ? "_" + className : "");
     }
+
+    protected String exportName;
+
+    public void setExportName(String exportName) {
+        if ("".equals(exportName)) {
+            exportName = null;
+        }
+        this.exportName = exportName;
+    }
+
+    public String getExportName() {
+        return exportName;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java
index 732956722..e759df4b1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.types.CLIPACTIONS;
 import com.jpexs.decompiler.flash.types.ColorTransform;
 import com.jpexs.decompiler.flash.types.MATRIX;
@@ -31,7 +32,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public abstract class PlaceObjectTypeTag extends CharacterIdTag {
+public abstract class PlaceObjectTypeTag extends Tag implements CharacterIdTag {
 
     public PlaceObjectTypeTag(SWF swf, int id, String name, ByteArrayRange data) {
         super(swf, id, name, data);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
index ef40bf020..adafea1d4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
@@ -360,7 +360,8 @@ public class Timeline {
         for (ASMSource asm : asmSources) {
             if (asm instanceof DoInitActionTag) {
                 DoInitActionTag initAction = (DoInitActionTag) asm;
-                String path = initAction.getExportName();
+                CharacterTag cht=swf.getCharacter(initAction.spriteId);
+                String path = cht!=null?cht.getExportName():"_unk_";
                 if (path == null || path.isEmpty()) {
                     path = initAction.getExportFileName();
                 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index bb0a2a5c2..fe4e0c490 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -2733,7 +2733,10 @@ public class XFLConverter {
                         DefineSpriteTag sprite = (DefineSpriteTag) characters.get(chid);
                         if (sprite.subTags.isEmpty()) {
                             String data = convertActionScript(dia);
-                            String expPath = dia.getExportName();
+                            CharacterTag spr=dia.getSwf().getCharacter(dia.spriteId);
+                            String expName = spr!=null?spr.getExportName():"_unk_";
+                            
+                            String expPath = spr.getExportName();
                             final String prefix = "__Packages.";
                             if (expPath.startsWith(prefix)) {
                                 expPath = expPath.substring(prefix.length());
diff --git a/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java b/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
index 5b1878cd9..6cda4935e 100644
--- a/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
+++ b/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
@@ -45,4 +45,9 @@ public enum TreeNodeType {
     BUNDLE_SWC,
     BUNDLE_BINARY,
     HEADER,
+    SET_BACKGROUNDCOLOR,
+    FILE_ATTRIBUTES,
+    METADATA,
+    PLACE_OBJECT,
+    REMOVE_OBJECT
 }
diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/fileattributes16.png b/src/com/jpexs/decompiler/flash/gui/graphics/fileattributes16.png
new file mode 100644
index 0000000000000000000000000000000000000000..92953feca611b75b80388eb9bfe59ae6664766e8
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!en~_@RCwBqQr}CHVHAG8_xoWmuyxUP
zQ**LVS%J)vb1o901%;GNr4ldu2a4!IA_*d*zoDxb>!KuLl_jWi=1rE1nItsYrn8GJ
z@n(v;A7AHv{l2Zdhz=aS_x;{;p7WgN9O+dwx>>GNta`Ny9e*0XNnnx$Ns<b(EZZ1k
zIA}__T(*Y#`|&T!=krJB=I0}-stz9nVY<FwH=W6nuOgFO6<>bm7LG(<v)OQ_yZd^n
zTz*z1rlt`y0x+p4GE}wh{4Od`#a|m6u-ol88wgw@fEPTGS`x0n=$tWyT&gQzFl%jT
z!PNA$2p$ZDIN*RRGb9p8V!*&m<rIa1KbWp*D)vexcsn|9b!Z3+pB6ECcZ}GnNTt&I
z)fK_O5QE90C$l#mcyH`Jtkxsw?d^fD(<hP&g@QRE5m=LyqnXwDS<@6sw&GG>9~Ki|
z;B0char_u|cJ^>S7^D~lD*0aw3~dd7LpbF=iP;Zxa5Xn09*>Jxx7&?bI;T?KpSWBn
zP-9T5t}-+<Xt;UnHnz66;PrU$b$J<~E0-}cGK?iUd)nI(JQut{LhCgKvauk15()wF
zDRAd=uU0B>I2`-ap>u_At?@2BA0OBGcy@P7LK`k1?{6))h72uJGPwk&(}`~@D?&MU
zTN`q@96l~AJpQ?!OEMVBiv{9ip>c8+O;m9v7KhL0Lpq&?zpD!YzaQCbR{U#gZM`%3
z{@qK)YSbx_##9#*C>D!|zJ7zgix-GZMkF^LZp7P(39%y&9zNQZo`%CQi^bAY<(sGL
z^&KZLjdp>vkqCTdDklD)?(|L$h6YA?907dh{9WW${J(9I|1dAV1sDL*4CSl9?h3;I
O0000<MNUMnLSTZa%t1H+

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/metadata16.png b/src/com/jpexs/decompiler/flash/gui/graphics/metadata16.png
new file mode 100644
index 0000000000000000000000000000000000000000..f64dd01170b529d64d1843e7fab38389b05bd796
GIT binary patch
literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+DSw~RCwBylgmyUF%*V>&t)G`DS3bj
zbwLG$42l$$aw!)z*&tv+5pO|wfhg$$Shjrv6c&&Rh#hQrkgC8g0;ydP5;0?+9=nst
zgi_l6($V<%^38AiSP&6TPEWrFQYJ_#5aQCAfF%Tk5H~B!%gJbjsNbkH8uT}{S}i)N
z*Q;@W4l7Rkc6r5djmxWR^VPZ5ezl5ZGKn|2+=rt^;~?(Q=@~VNV{5A%8rla7%fij=
zEmElzrgFLUdb8<r_gVz#A#B?T0U`t_)BkFC7-#3_P<%$48ygzDI^dvZ!F3&m*dc(R
z7;xY1z{_Mz^rVOew-6<ci!Yx)VQh5VEY^_OxjB^g$`~1WjknV?crldtwZEqTwrydn
zSRA}2R&je9Qc46tfX8|SaIv?$i}d&e<`);Zy@Pam!oXx8F+2b6H-H&Dtkuk2ce-8T
zf-><C1mtr_QY4k42j8drPRGm(=bN>IXTS&eu~LEOO|oT$Lg76s<uWpvNn?L$Y4Ldn
zyy)3#^nLjU2fA`tmL*Usm5|M5O${h^kuMZXpXYhV=ktiq@4tm+lm18H{Jw+s-Q7j~
z_;^~s#^?`3cuKm++U@p5lxqrizT|cS|E?dr?yGM66kq^7%!;Q=*sCA_0000<MNUMn
GLSTY5gaUs6

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/placeobject16.png b/src/com/jpexs/decompiler/flash/gui/graphics/placeobject16.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ea124a744763ffe056b84a56b6100c45303068a
GIT binary patch
literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!TuDShRCwB?Q%h)5Q4l@%Hf@rJNg7LO
zOSE9Yja{}C5&U5hkwRB>CkTpyMMUf(3l}b2gjyF`6&DIhc6Ox{+>|cFg@&|{O2tC7
zAdLz6G)>ax`#zm{`4v-e;e~nJcjwMIGjrw&!!Yna%fcTaMC0Jn42Dz<K3&HsL$gOp
zpiN?d%sYP%OZB@<F3e92;Nmo%yAL>TT{&|D$NC3RR&&_ON0G>EAhaGrFuaO#MVp(S
z!sQkK3V!D~*f;U)njb5Xw^&~Hqoi_nfR*x8ItH*)bYU^Hf<jq)L77Z80LC7RA%{%~
zKDqA4;*UwBwqsCr;LfRPf1Z98un~w9?MSA(@O3Q)O~>$uyT+2_3l$ZQ#zw~R?awQu
z3Nb1e(3@?6#zy}}TLpGy6TNQoYnWl5tlc?xq~|cg$&V&;nIcMh6M*+cDu+w5D`hwp
zv%6;-DsZADZHwyc#Lba(i&WmzO{rfl3saT4`m!n`kl9H<SmeKjm;20tB!E;l3e~ZR
zSz_QaI9>0FDvj@pFqLSh-dG8MW(4)oG4Zq#0^#T{7)3X1R;rWC+R<d;J)f~Jn*nlp
zA}J!!07!m^Z!Ho>GNHrJB`nNlX#((`&os&^9v6tF4a6zNEWb8L%K7_v<Lbu5QIAA-
zj}Au{;Ij3a0GVP8xfBJ*1b#*hWa5}xc!;YMo8LRi{TCkKwbF^vKDU6wZZzuTj^_$h
z=Ix{zJVnR9Tiyb#fx&T{JT#2k7CVmDrDC^QKwu+?+12;>#KHSMrrP2$@sK(H5->{^
gA<OT5jk^L20NhLmOOn*Du>b%707*qoM6N<$f(m;$tN;K2

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/removeobject16.png b/src/com/jpexs/decompiler/flash/gui/graphics/removeobject16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ace289edd9f926ac7efbb4fdec05a31bebff5c50
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!SxH1eRCwBqQ%h)5Q4l@%eUplX`e`82
zR76o~gj&=tTBD`fx=`G8<4#=&c2VfUwM!R*3kxp9jXO6g3eupqiFHwx2sK2DA8aJm
z#>QxDlb83q-g)V>(Fk^6xXjEs=gr)Cm*Fo<^mL4I$34wC5BNF8n89S}#-XQ~^YvJP
z0rP`oZ*;)1tns$P{b=pl2d$+AUX=r8v50)?1wKtaf~=~8v8i<Y4}s*t=m3-C@#xue
z2n2PMr<1U=A7JO_p|pmfM7E)+I|idtMf&<RaMu}(JxRxZ3ruwH<a<X(Aur@mes~YA
zV}Z#s{1&+5K$2B79XSCfv;{A(Tt?sYEF%Fa(X)Fja`YI~LLTM#Z5kM|7J#H^!d362
znDSI79N~#aAD3L$JrnBeg7Nr1WLGFw4Y0~GSb1sHMNE0B6OQo2BLPK7>q<Tcvs%H1
z2Q&De6_0m<@Wk^vfW*MF?;%MF)?$PsJn?D*Vm9{UJLKTHH3<-o@Wk^*;Eb8JWogR#
zW-OoT2W*=b+{h$?qJVG$58`<Oi>7@iUs@V!3vC9|bnoZDKlrp!MjH|$pBKJ@cq?f{
zCVHcD`}cGp5YXv%Ya$H|FfqRb!>Ho<s|@<4((MA5l|(H&Stt#sGP5v6`>L)()ikK8
z3Pm`bUM%udCmi94x3Wgy;_K{9I_=cV)$Lo`5e|pMWd*@_tw+Z&FrWK^cOU1F`1W(y
z$NMAr)+~I-tpmF*Y*Lkz;vzI~AHmE;%f37G?9C++ycJ$*c#U-y5x&t|@v6DP3x3=6
d&-s@C0{~E>2o(vq?o0px002ovPDHLkV1inyM1%kU

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/setbackgroundcolor16.png b/src/com/jpexs/decompiler/flash/gui/graphics/setbackgroundcolor16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4eb0e4465b03363fb2dff25c6d57084387e2dd4
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwBaQ(Z_DQ561Wccoh0+1=8x
zKWQs^iC${zp+f0b!3sno>mek_KsWodTv*bFdeBuX)1VA2q6k8IiXbR36C`vKg^0*3
zQ=zTIot@cnc4qF}?hGo4;(^1=oO8bKeCN)&Ttz5?1&x|;ng-qkj>GLBwEx|ExLhud
z*_<-RJRGGUgdn9ERMiPRH1rs7rol8R<23D@VHmbs@AC*uR-~ph8oqQI*TX?5szG%Y
zqgIZQ8@hoVd3&&KQve<xKbOD)>jt4$f~U~gGl<@SuV`%uvu?yfGq8z*lgFUzI!xBx
zQe+cY?1X)=LTX9#dwHzz`{DEY@MZWH3<d_{xE2_N#z?GMYg9UO1|~6~X*w-EaTo;$
za&bN!!S0<~;YxEME=o{M4sOp<C<bNY*vO9AL$qb<IxQ*6$MDY>c#j8F=gy++VlCFJ
z^kXuq;AYM!+VXuUEZ7gKt4t9o2FE?K2?#Oi(Zap>Js~p5UU+#Pl>MpTnNn2MHezjd
z7A7PGv3LUAeS=s}Vl3|fF-Qr+ci1E78nI{g`+RUXosi-Z#6$u`g$Hq~?Fm+AXWFC0
z<s`^ZAHX>o%HD@!XSC<-%Z#iIW&3h>F+C2*2^msShQf-I$`qFSz3BSz5gT(>;m61r
zvbYq!`L;l14fIqBj`C0>+TL6vwA_DW2NZP*Q*3ToQEU~WD1vt{LI2<<q-XGGYN!!(
zd2(Q8AsyDUyt+R6@J_AJ{`C1Yi3&+(N+byh=AxK@JHv~X`j8N49Eci;KV5TH+1l?4
zOUdmT;dN&>6xLmqXTTzsrF+m?cU8DteIp7(gBBZk#VvFfERqLJVd3-8_y52=?lN#?
zs4nW_C|nFV+J2#n5?!<!&$|m2$-PKONa=JI9Aq&U+n#1+8~%=uBeU{_GS+Y;kEW8n
jSj4tZ`(n2Fp8x{@>{yPzrG3gL00000NkvXXu0mjf{9$c>

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
index 262180647..76406e400 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
@@ -96,6 +96,8 @@ import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import com.jpexs.decompiler.flash.tags.base.ButtonTag;
 import com.jpexs.decompiler.flash.tags.base.ImageTag;
 import com.jpexs.decompiler.flash.tags.base.MorphShapeTag;
+import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag;
+import com.jpexs.decompiler.flash.tags.base.RemoveTag;
 import com.jpexs.decompiler.flash.tags.base.ShapeTag;
 import com.jpexs.decompiler.flash.tags.base.SymbolClassTypeTag;
 import com.jpexs.decompiler.flash.tags.base.TextTag;
@@ -336,6 +338,21 @@ public class TagTree extends JTree {
             }
         }
 
+        if(t instanceof SetBackgroundColorTag){
+            return TreeNodeType.SET_BACKGROUNDCOLOR;
+        }
+        if(t instanceof FileAttributesTag){
+            return TreeNodeType.FILE_ATTRIBUTES;
+        }
+        if(t instanceof MetadataTag){
+            return TreeNodeType.METADATA;
+        }
+        if(t instanceof PlaceObjectTypeTag){
+            return TreeNodeType.PLACE_OBJECT;
+        }
+        if(t instanceof RemoveTag){
+            return TreeNodeType.REMOVE_OBJECT;
+        }
         if (t instanceof Tag) {
             return TreeNodeType.OTHER_TAG;
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeModel.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeModel.java
index eeaa7109c..b91a377aa 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeModel.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeModel.java
@@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.tags.SoundStreamBlockTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import com.jpexs.decompiler.flash.tags.base.ASMSourceContainer;
+import com.jpexs.decompiler.flash.tags.base.CharacterIdTag;
+import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
 import com.jpexs.decompiler.flash.timeline.AS2Package;
 import com.jpexs.decompiler.flash.timeline.AS3Package;
@@ -190,7 +192,7 @@ public class TagTreeModel implements TreeModel {
         List<TreeItem> sounds = new ArrayList<>();
         List<TreeItem> binaryData = new ArrayList<>();
         List<TreeItem> others = new ArrayList<>();
-
+        Map<Integer, List<TreeItem>> mappedTags = new HashMap<>();
         for (Tag t : swf.tags) {
             TreeNodeType ttype = TagTree.getTreeNodeType(t);
             switch (ttype) {
@@ -229,7 +231,20 @@ public class TagTreeModel implements TreeModel {
                     break;
                 default:
                     if (t.getId() != ShowFrameTag.ID && !ShowFrameTag.isNestedTagType(t.getId())) {
-                        others.add(t);
+                        boolean parentFound = false;
+                        if ((t instanceof CharacterIdTag) && !(t instanceof CharacterTag)) {
+                            CharacterIdTag chit = (CharacterIdTag) t;
+                            if (swf.getCharacter(chit.getCharacterId()) != null) {
+                                parentFound = true;
+                                if (!mappedTags.containsKey(chit.getCharacterId())) {
+                                    mappedTags.put(chit.getCharacterId(), new ArrayList<>());
+                                }
+                                mappedTags.get(chit.getCharacterId()).add(t);                                
+                            }
+                        }
+                        if (!parentFound) {
+                            others.add(t);
+                        }
                     }
                     break;
             }
@@ -318,6 +333,7 @@ public class TagTreeModel implements TreeModel {
 
         TagTreeSwfInfo swfInfo = new TagTreeSwfInfo();
         swfInfo.folders = nodeList;
+        swfInfo.mappedTags = mappedTags;
         swfInfo.tagScriptCache = currentTagScriptCache;
         swfInfos.put(swf, swfInfo);
     }
@@ -461,6 +477,20 @@ public class TagTreeModel implements TreeModel {
 
         return swfInfo.folders;
     }
+    
+    private List<TreeItem> getMappedCharacters(SWF swf,CharacterTag tag) {
+        TagTreeSwfInfo swfInfo = swfInfos.get(swf);
+        if (swfInfo == null) {
+            createTagList(swf);
+            swfInfo = swfInfos.get(swf);
+        }
+
+        List<TreeItem> mapped = swfInfo.mappedTags.get(tag.getCharacterId());
+        if(mapped == null){
+            mapped = new ArrayList<>();
+        }
+        return mapped;
+    }
 
     public List<? extends TreeItem> getAllChildren(Object parent) {
         TreeItem parentNode = (TreeItem) parent;
@@ -530,6 +560,8 @@ public class TagTreeModel implements TreeModel {
             } else {
                 return new ArrayList<>();
             }
+        } else if (parentNode instanceof CharacterTag){
+            return getMappedCharacters(((CharacterTag)parentNode).getSwf(),(CharacterTag)parentNode);
         }
 
         return new ArrayList<>();
@@ -600,6 +632,8 @@ public class TagTreeModel implements TreeModel {
             return clt.getChild(clt.getRoot(), index);
         } else if (parentNode instanceof AS3ClassTreeItem) {
             return ((AS3Package) parentNode).getChild(index);
+        } else if (parentNode instanceof CharacterTag){
+            return getMappedCharacters(((CharacterTag)parentNode).getSwf(),(CharacterTag)parentNode).get(index);
         }
 
         throw new Error("Unsupported parent type: " + parentNode.getClass().getName());
@@ -636,6 +670,8 @@ public class TagTreeModel implements TreeModel {
             return clt.getChildCount(clt.getRoot());
         } else if (parentNode instanceof AS3Package) {
             return ((AS3Package) parentNode).getChildCount();
+        } else if (parentNode instanceof CharacterTag){
+            return getMappedCharacters(((CharacterTag)parentNode).getSwf(),(CharacterTag)parentNode).size();
         }
 
         return 0;
@@ -690,6 +726,8 @@ public class TagTreeModel implements TreeModel {
             return clt.getIndexOfChild(clt.getRoot(), childNode);
         } else if (parentNode instanceof AS3ClassTreeItem) {
             return ((AS3Package) parentNode).getIndexOfChild((AS3ClassTreeItem) childNode);
+        } else if (parentNode instanceof CharacterTag){
+            return getMappedCharacters(((CharacterTag)parentNode).getSwf(),(CharacterTag)parentNode).indexOf(childNode);
         }
 
         throw new Error("Unsupported parent type: " + parentNode.getClass().getName());
diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeSwfInfo.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeSwfInfo.java
index 5d95f5314..06eb8589f 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeSwfInfo.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeSwfInfo.java
@@ -29,6 +29,7 @@ import java.util.Map;
 public class TagTreeSwfInfo {
 
     public List<TreeItem> folders;
+    public Map<Integer,List<TreeItem>> mappedTags;
 
     public Map<Tag, TagScript> tagScriptCache;
 }