From 057a12ccba68ea9d93fb65dc0f9343aca85239c9 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Tue, 20 Oct 2015 09:35:10 +0200 Subject: [PATCH] test fix --- .../src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java | 1 + .../src/com/jpexs/decompiler/flash/tags/DoActionTag.java | 1 + .../src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java | 1 + .../src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java | 1 + .../src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java | 1 + .../jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java index 0aa91ea11..f02a2ac43 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java @@ -193,6 +193,7 @@ public class DefineButtonTag extends ButtonTag implements ASMSource { @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = new ByteArrayRange(actionBytes); + SWF.uncache(this); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoActionTag.java index faec53f29..b888fcc01 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoActionTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoActionTag.java @@ -147,6 +147,7 @@ public class DoActionTag extends Tag implements ASMSource { @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = new ByteArrayRange(actionBytes); + SWF.uncache(this); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java index 99ff05466..ee14d6d79 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java @@ -145,6 +145,7 @@ public class DoInitActionTag extends Tag implements CharacterIdTag, ASMSource { @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = new ByteArrayRange(actionBytes); + SWF.uncache(this); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java index 53467b4c3..18088e6c9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java @@ -214,6 +214,7 @@ public class BUTTONCONDACTION implements ASMSource, Serializable { @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = new ByteArrayRange(actionBytes); + SWF.uncache(this); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java index 1a52f1616..8bbddace8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java @@ -207,6 +207,7 @@ public class CLIPACTIONRECORD implements ASMSource, Serializable { @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = new ByteArrayRange(actionBytes); + SWF.uncache(this); } @Override diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java index a035f4ca2..09482e810 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java @@ -58,7 +58,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase { HighlightedTextWriter writer = new HighlightedTextWriter(new CodeFormatting(), false); List actions = par.actionsFromString(str); byte[] hex = Action.actionsToBytes(actions, true, SWF.DEFAULT_VERSION); - ActionList list = ActionListReader.readActionListTimeout(new ArrayList<>(), new SWFInputStream(swf, hex), SWF.DEFAULT_VERSION, 0, hex.length, ""); + ActionList list = ActionListReader.readActionListTimeout(new ArrayList<>(), new SWFInputStream(swf, hex), SWF.DEFAULT_VERSION, 0, hex.length, "", 1); Action.actionsToSource(null, list, "", writer); return writer.toString(); }