diff --git a/CHANGELOG.md b/CHANGELOG.md index f61f51fd6..3bcb7020b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Close action on SWF inside DefineBinaryData +- [#2093] AS3 Unnecessary use of fully qualified names for classes in same package ## [19.0.0] - 2023-10-01 ### Added @@ -3126,6 +3127,7 @@ Major version of SWF to XML export changed to 2. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#2090]: https://www.free-decompiler.com/flash/issues/2090 [#2079]: https://www.free-decompiler.com/flash/issues/2079 +[#2093]: https://www.free-decompiler.com/flash/issues/2093 [#1449]: https://www.free-decompiler.com/flash/issues/1449 [#2070]: https://www.free-decompiler.com/flash/issues/2070 [#2073]: https://www.free-decompiler.com/flash/issues/2073 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java index 9d4fbd8b9..21e045ce0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java @@ -277,6 +277,9 @@ public abstract class Trait implements Cloneable, Serializable { for (DottedChain imp : imports) { if (imp.getLast().equals("*")) { + if (imp.getWithoutLast().equals(ignorePackage)) { + continue; + } Set objectsInPkg = abcIndex.getPackageObjects(imp.getWithoutLast()); for (String objectName : objectsInPkg) { if (importnames.contains(objectName)) { diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java index 927405c79..0fc22d0cc 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java @@ -46,6 +46,7 @@ public class ActionScript2Test extends ActionScript2TestBase { Configuration.simplifyExpressions.set(false); Configuration.decompile.set(true); Configuration.registerNameFormat.set("_loc%d_"); + Configuration.autoRenameIdentifiers.set(false); swf = new SWF(new BufferedInputStream(new FileInputStream("testdata/as2/as2.swf")), false); } diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java index 3ec54dd32..0a7af644f 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/RecompileTest.java @@ -71,6 +71,7 @@ public class RecompileTest extends FileTestBase { try { try ( FileInputStream fis = new FileInputStream(filePath)) { Configuration._debugCopy.set(true); + Configuration.autoRenameIdentifiers.set(false); SWF swf = new SWF(new BufferedInputStream(fis), false); swf.saveTo(new ByteArrayOutputStream()); }