From 4e3c4b644430cb6617beaa2d57cf9a7d11d39a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20St=C3=B6cker?= Date: Mon, 23 Jun 2014 18:42:19 +0200 Subject: [PATCH 1/4] fix compilation issues on my system --- src/com/jpexs/decompiler/flash/SWF.java | 5 +++ .../jpexs/decompiler/flash/SWFStreamTest.java | 36 +++++++++---------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/SWF.java b/src/com/jpexs/decompiler/flash/SWF.java index 182c48888..8f09a092d 100644 --- a/src/com/jpexs/decompiler/flash/SWF.java +++ b/src/com/jpexs/decompiler/flash/SWF.java @@ -1533,6 +1533,11 @@ public final class SWF implements TreeItem, Timelined { return fframes.size() > pos; } + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + @Override public BufferedImage next() { if (!hasNext()) { diff --git a/test/com/jpexs/decompiler/flash/SWFStreamTest.java b/test/com/jpexs/decompiler/flash/SWFStreamTest.java index 09f8e580b..97e9e8497 100644 --- a/test/com/jpexs/decompiler/flash/SWFStreamTest.java +++ b/test/com/jpexs/decompiler/flash/SWFStreamTest.java @@ -57,7 +57,7 @@ public class SWFStreamTest { sos.writeFB(20, f); } try (SWFInputStream sis = new SWFInputStream(null, baos.toByteArray())) { - assertTrue(Double.compare(f, sis.readFB(20)) == 0); + assertTrue(Double.compare(f, sis.readFB(20, "test")) == 0); } } @@ -72,11 +72,11 @@ public class SWFStreamTest { sos.writeUB(9, 5); } try (SWFInputStream sis = new SWFInputStream(null, baos.toByteArray())) { - assertEquals(1, sis.readUB(5)); - assertEquals(2, sis.readUB(6)); - assertEquals(3, sis.readUB(7)); - assertEquals(4, sis.readUB(8)); - assertEquals(5, sis.readUB(9)); + assertEquals(1, sis.readUB(5, "test")); + assertEquals(2, sis.readUB(6, "test")); + assertEquals(3, sis.readUB(7, "test")); + assertEquals(4, sis.readUB(8, "test")); + assertEquals(5, sis.readUB(9, "test")); } } @@ -91,11 +91,11 @@ public class SWFStreamTest { sos.writeSB(9, -5); } try (SWFInputStream sis = new SWFInputStream(null, baos.toByteArray())) { - assertEquals(-1, sis.readSB(5)); - assertEquals(2, sis.readSB(6)); - assertEquals(-3, sis.readSB(7)); - assertEquals(4, sis.readSB(8)); - assertEquals(-5, sis.readSB(9)); + assertEquals(-1, sis.readSB(5, "test")); + assertEquals(2, sis.readSB(6, "test")); + assertEquals(-3, sis.readSB(7, "test")); + assertEquals(4, sis.readSB(8, "test")); + assertEquals(-5, sis.readSB(9, "test")); } } @@ -107,7 +107,7 @@ public class SWFStreamTest { sos.writeFLOAT(f); sos.close(); SWFInputStream sis = new SWFInputStream(null, baos.toByteArray()); - assertEquals(f, sis.readFLOAT()); + assertEquals(f, sis.readFLOAT("test")); sis.close(); baos = new ByteArrayOutputStream(); @@ -116,7 +116,7 @@ public class SWFStreamTest { sos.writeFLOAT16(f); sos.close(); sis = new SWFInputStream(null, baos.toByteArray()); - assertEquals(f, sis.readFLOAT16()); + assertEquals(f, sis.readFLOAT16("test")); sis.close(); baos = new ByteArrayOutputStream(); @@ -125,7 +125,7 @@ public class SWFStreamTest { sos.writeDOUBLE(d); sos.close(); sis = new SWFInputStream(null, baos.toByteArray()); - assertEquals(d, sis.readDOUBLE()); + assertEquals(d, sis.readDOUBLE("test")); sis.close(); } @@ -134,7 +134,7 @@ public class SWFStreamTest { //example from specification byte[] data = new byte[]{(byte) 0x00, (byte) 0x80, (byte) 0x07, (byte) 0x00}; SWFInputStream sis = new SWFInputStream(null, data); - assertTrue(Double.compare(7.5, sis.readFIXED()) == 0); + assertTrue(Double.compare(7.5, sis.readFIXED("test")) == 0); sis.close(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -143,7 +143,7 @@ public class SWFStreamTest { sos.writeFIXED(dd); sos.close(); sis = new SWFInputStream(null, baos.toByteArray()); - assertTrue(Double.compare(dd, sis.readFIXED()) == 0); + assertTrue(Double.compare(dd, sis.readFIXED("test")) == 0); sis.close(); baos = new ByteArrayOutputStream(); @@ -152,7 +152,7 @@ public class SWFStreamTest { sos.writeFIXED8(ff); sos.close(); sis = new SWFInputStream(null, baos.toByteArray()); - assertEquals(ff, sis.readFIXED8()); + assertEquals(ff, sis.readFIXED8("test")); sis.close(); } @@ -165,7 +165,7 @@ public class SWFStreamTest { sos.writeRECT(rect); } try (SWFInputStream sis = new SWFInputStream(null, baos.toByteArray())) { - RECT readRECT = sis.readRECT(); + RECT readRECT = sis.readRECT("test"); assertEquals(readRECT.Xmin, -0x3FFFFFFF); assertEquals(readRECT.Xmax, 0x3FFFFFFF); assertEquals(readRECT.Ymin, -0x3FFFFFFF); From 9196223af9e771d4af2c299a77357e6f623fe759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20St=C3=B6cker?= Date: Mon, 23 Jun 2014 18:54:15 +0200 Subject: [PATCH 2/4] no test failure when settings are different --- test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java b/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java index 4dc573cfc..687bd0892 100644 --- a/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java +++ b/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java @@ -71,7 +71,7 @@ public class ActionScript2AssemblerTest extends ActionStript2TestBase { String decompiled = writer.toString(); assertEquals(actualResult.trim(), "ok = false;"); - assertTrue(decompiled.contains("Push \"ok\" false")); + assertTrue(decompiled.contains("Push \"ok\" false") || decompiled.contains("Push constant0 false")); } catch (IOException | ParseException | InterruptedException ex) { fail(); } From 12d75c7fb51ab04b1835e218475a2816a6c9439d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20St=C3=B6cker?= Date: Mon, 23 Jun 2014 19:24:47 +0200 Subject: [PATCH 3/4] add missing variable, so settings can be displayed again --- .../flash/gui/locales/AdvancedSettingsDialog.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index 5b0c16875..231a77167 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -57,6 +57,9 @@ config.description.openMultipleFiles = Allows opening multiple files at once in config.name.decompile = Show ActionScript source config.description.decompile = You can disable AS decompilation, then only P-code is shown +config.name.dumpView = Dump View +config.description.dumpView = View raw data dump + config.name.parallelSpeedUp = Parallel SpeedUp config.description.parallelSpeedUp = Parallelism can speed up decompilation From 405144437d0391c3240d5e065d14f69641a27ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20St=C3=B6cker?= Date: Mon, 23 Jun 2014 19:53:22 +0200 Subject: [PATCH 4/4] typo --- .../flash/action/parser/script/ActionScriptParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index b1a90a02e..73aaf32d4 100644 --- a/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -1758,7 +1758,7 @@ public class ActionScriptParser { } } if (lexer.lex().type != SymbolType.EOF) { - throw new ParseException("Parsing finisned before end of the file", lexer.yyline()); + throw new ParseException("Parsing finished before end of the file", lexer.yyline()); } return retTree; }