From 50fb1f41de3b8b717eccb53d9e6a0d48cec5a8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 29 Sep 2023 18:24:33 +0200 Subject: [PATCH] ABC Explorer - fix invalid count of items, fix prefix --- .../flash/gui/abc/ABCExplorerDialog.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCExplorerDialog.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCExplorerDialog.java index fc0829dc2..59c89aab6 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCExplorerDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCExplorerDialog.java @@ -556,10 +556,10 @@ public class ABCExplorerDialog extends AppDialog { case INSTANCE_INFO: InstanceInfo ii = abc.instance_info.get(index); String iiName = "\"" + Helper.escapePCodeString(ii.getName(abc.constants).getNameWithNamespace(abc.constants, false).toRawString()) + "\""; - return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.INSTANCE_INFO, ii, iiName + (ii.instance_traits.traits.isEmpty() ? "" : ", " + ii.instance_traits.traits.size() + " traits")); + return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.INSTANCE_INFO, ii, iiName + (ii.instance_traits.traits.isEmpty() ? "" : ", " + ii.instance_traits.traits.size() + " traits"), prefix); case CLASS_INFO: ClassInfo ci = abc.class_info.get(index); - return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.CLASS_INFO, ci, "mi" + ci.cinit_index + (ci.static_traits.traits.isEmpty() ? "" : ", " + ci.static_traits.traits.size() + " traits")); + return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.CLASS_INFO, ci, "mi" + ci.cinit_index + (ci.static_traits.traits.isEmpty() ? "" : ", " + ci.static_traits.traits.size() + " traits"), prefix); case SCRIPT_INFO: ScriptInfo si = abc.script_info.get(index); DottedChain simplePackName = si.getSimplePackName(abc); @@ -567,7 +567,7 @@ public class ABCExplorerDialog extends AppDialog { if (simplePackName != null) { siName = " (\"" + Helper.escapePCodeString(simplePackName.toRawString()) + "\")"; } - return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.SCRIPT_INFO, si, "mi" + si.init_index + (si.traits.traits.isEmpty() ? "" : ", " + si.traits.traits.size() + " traits") + siName); + return new ValueWithIndex(parent, currentLevelIndex, index, TreeType.SCRIPT_INFO, si, "mi" + si.init_index + (si.traits.traits.isEmpty() ? "" : ", " + si.traits.traits.size() + " traits") + siName, prefix); default: return new ValueWithIndex(parent, currentLevelIndex, index, valueType, null, "", prefix); } @@ -579,20 +579,20 @@ public class ABCExplorerDialog extends AppDialog { if (t instanceof TraitSlotConst) { TraitSlotConst tsc = (TraitSlotConst) t; if (tsc.value_index == 0) { - return 6; + return 3 + 3; } - return 7; + return 3 + 4; } if (t instanceof TraitMethodGetterSetter) { - return 2; + return 3 + 2; } if (t instanceof TraitClass) { - return 3; + return 3 + 3; } if (t instanceof TraitFunction) { - return 2; + return 3 + 2; } } return traits.traits.size();