From 599f75a699bb7c3e185e202438c3bb79682edfb5 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Thu, 10 Sep 2015 09:27:05 +0200 Subject: [PATCH] #1041 FFDec (java) package names in decompiled AS code: partial fix --- .../action/model/CallMethodActionItem.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index 6f5ae85b1..77b5e0fd5 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -65,20 +65,26 @@ public class CallMethodActionItem extends ActionItem { blankMethod = true; } } - } - if (!blankMethod) { - if (scriptObject.getPrecedence() > this.precedence) { - writer.append("("); - scriptObject.toString(writer, localData); - writer.append(")"); + + if (!blankMethod) { + if (scriptObject.getPrecedence() > this.precedence) { + writer.append("("); + scriptObject.toString(writer, localData); + writer.append(")"); + } else { + scriptObject.toString(writer, localData); + } + writer.append("."); + writer.append(IdentifiersDeobfuscation.printIdentifier(false, methodName.toStringNoQuotes(localData))); } else { scriptObject.toString(writer, localData); } - writer.append("."); - writer.append(IdentifiersDeobfuscation.printIdentifier(false, methodName.toStringNoQuotes(localData))); } else { - scriptObject.toString(writer, localData); + writer.append("this["); + methodName.appendTo(writer, localData); + writer.append("].call"); } + writer.spaceBeforeCallParenthesies(arguments.size()); writer.append("(");