diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java index e0954484a..2776eabdc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java @@ -465,6 +465,15 @@ public abstract class Action implements GraphSourceItem { return writer.toString(); } + private static void informListeners(List listeners, int pos, int count) { + if (pos % INFORM_LISTENER_RESOLUTION == 0) { + DisassemblyListener[] listenersArray = listeners.toArray(new DisassemblyListener[listeners.size()]); + for (DisassemblyListener listener : listenersArray) { + listener.progressToString(pos + 1, count); + } + } + } + /** * Converts list of actions to ASM source * @@ -493,11 +502,7 @@ public abstract class Action implements GraphSourceItem { int pos = 0; boolean lastPush = false; for (Action a : list) { - if (pos % INFORM_LISTENER_RESOLUTION == 0) { - for (DisassemblyListener listener : listeners) { - listener.progressToString(pos + 1, list.size()); - } - } + informListeners(listeners, pos, list.size()); if (exportMode == ScriptExportMode.PCODE_HEX) { if (lastPush) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/AS3Package.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/AS3Package.java index 5754ab595..490923988 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/AS3Package.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/AS3Package.java @@ -16,6 +16,7 @@ */ package com.jpexs.decompiler.flash.timeline; +import com.jpexs.decompiler.flash.IdentifiersDeobfuscation; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.ScriptPack; import com.jpexs.decompiler.flash.treeitems.AS3ClassTreeItem; @@ -145,7 +146,7 @@ public class AS3Package extends AS3ClassTreeItem { @Override public String toString() { - return packageName; + return IdentifiersDeobfuscation.printIdentifier(true, packageName); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/AS3ClassTreeItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/AS3ClassTreeItem.java index 1fd25bfae..a9e4aaf3d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/AS3ClassTreeItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/AS3ClassTreeItem.java @@ -16,6 +16,7 @@ */ package com.jpexs.decompiler.flash.treeitems; +import com.jpexs.decompiler.flash.IdentifiersDeobfuscation; import com.jpexs.decompiler.flash.abc.ClassPath; /** @@ -43,6 +44,6 @@ public abstract class AS3ClassTreeItem implements TreeItem { @Override public String toString() { - return name; + return IdentifiersDeobfuscation.printIdentifier(true, name); } }