From 0ced32782966c16ecb9d5f6bd7cb613899fd2045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Wed, 27 Sep 2023 20:51:34 +0200 Subject: [PATCH] more methods fix --- .../decompiler/flash/abc/ScriptPack.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java index bb854071a..3f2e7ad83 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java @@ -117,18 +117,17 @@ public class ScriptPack extends AS3ClassTreeItem { DottedChain packageName = DottedChain.TOPLEVEL; for (int t : traitIndices) { Multiname name = abc.script_info.get(scriptIndex).traits.traits.get(t).getName(abc); - Namespace ns = name.getNamespace(abc.constants); - if ((ns.kind == Namespace.KIND_PACKAGE) || (ns.kind == Namespace.KIND_PACKAGE_INTERNAL)) { - packageName = ns.getName(abc.constants); // assume not null + int nskind = name.getSimpleNamespaceKind(abc.constants); + if ((nskind == Namespace.KIND_PACKAGE) || (nskind == Namespace.KIND_PACKAGE_INTERNAL)) { + packageName = name.getSimpleNamespaceName(abc.constants); // assume not null } } return packageName; } - public Trait getPublicTrait() { + public Trait getPublicTrait() { for (int t : traitIndices) { Multiname name = abc.script_info.get(scriptIndex).traits.traits.get(t).getName(abc); - //Namespace ns = name.getNamespace(abc.constants); int nskind = name.getSimpleNamespaceKind(abc.constants); if ((nskind == Namespace.KIND_PACKAGE) || (nskind == Namespace.KIND_PACKAGE_INTERNAL)) { return abc.script_info.get(scriptIndex).traits.traits.get(t); @@ -141,8 +140,8 @@ public class ScriptPack extends AS3ClassTreeItem { String scriptName = ""; for (int t : traitIndices) { Multiname name = abc.script_info.get(scriptIndex).traits.traits.get(t).getName(abc); - Namespace ns = name.getNamespace(abc.constants); - if ((ns.kind == Namespace.KIND_PACKAGE) || (ns.kind == Namespace.KIND_PACKAGE_INTERNAL)) { + int nskind = name.getSimpleNamespaceKind(abc.constants); + if ((nskind == Namespace.KIND_PACKAGE) || (nskind == Namespace.KIND_PACKAGE_INTERNAL)) { scriptName = name.getName(abc.constants, null, false, true); } } @@ -166,19 +165,6 @@ public class ScriptPack extends AS3ClassTreeItem { return getExportFile(directory, exportSettings.getFileExtension()); } - /*public String getPath() { - String packageName = ""; - String scriptName = ""; - for (int t : traitIndices) { - Multiname name = abc.script_info[scriptIndex].traits.traits.get(t).getName(abc); - Namespace ns = name.getNamespace(abc.constants); - if ((ns.kind == Namespace.KIND_PACKAGE) || (ns.kind == Namespace.KIND_PACKAGE_INTERNAL)) { - packageName = ns.getName(abc.constants); - scriptName = name.getName(abc.constants, new ArrayList<>()); - } - } - return packageName.equals("") ? scriptName : packageName + "." + scriptName; - }*/ public void convert(AbcIndexing abcIndex, final NulWriter writer, final List traits, final ConvertData convertData, final ScriptExportMode exportMode, final boolean parallel) throws InterruptedException { int sinit_index = abc.script_info.get(scriptIndex).init_index;