From bc7d05056c96aecbe53ea47fc9fbd6bd69e0a7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 8 Nov 2015 11:23:30 +0100 Subject: [PATCH] fix --- .../parser/script/ActionScript3Parser.java | 6 +++--- libsrc/ffdec_lib/testdata/as3/as3.fla | Bin 1279539 -> 1279570 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java index 218f8f58f..4dd784905 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java @@ -698,7 +698,7 @@ public class ActionScript3Parser { namespace = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_NAMESPACE, pkg == null || pkg.isEmpty() ? classNameStr : pkg + ":" + classNameStr, 0, true); } else { if (packageInternalNs == 0) { - packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(new Namespace(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId(pkg.toRawString(), true)), 0, true); + packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId(pkg.toRawString(), true), 0, true); } namespace = packageInternalNs; } @@ -974,9 +974,9 @@ public class ActionScript3Parser { int privateNs = 0; int packageInternalNs = 0; if (pkg != null && !pkg.isEmpty()) { - openedNamespaces.add(packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(new Namespace(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId(pkg, true)), 0, true)); + openedNamespaces.add(packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId(pkg, true), 0, true)); } else { - openedNamespaces.add(packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(new Namespace(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId("", true)), 0, true)); + openedNamespaces.add(packageInternalNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE_INTERNAL, abcIndex.getSelectedAbc().constants.getStringId("", true), 0, true)); } if (pkg != null && !pkg.isEmpty()) { openedNamespaces.add(publicNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE, "", 0, true)); diff --git a/libsrc/ffdec_lib/testdata/as3/as3.fla b/libsrc/ffdec_lib/testdata/as3/as3.fla index 8390083f7cee2cfb315a342a252fa87987869dea..c19782d6d4e8fe03b33795309a5818e95a6b7aba 100644 GIT binary patch delta 3540 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 delta 3498 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