From b5678836515209c2ec3624b6f9d63e889b1681b0 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 26 Aug 2014 17:13:19 +0800 Subject: [PATCH 1/3] Fix compilation against failure against JDK 7u65 Interface java.util.Iterator requires void remove(), but it's not provided --- .../src/com/jpexs/decompiler/flash/action/ActionList.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java index 2e7ba0c83..0d8a87404 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java @@ -137,6 +137,12 @@ public class ActionList extends ArrayList { } return null; } + + @Override + public void remove() + { + throw UnsupportedOperationException(); + } }; } From f0547c7b6387e638ab6876059c27f1f3e00b4822 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 26 Aug 2014 17:27:34 +0800 Subject: [PATCH 2/3] Forget to type new --- .../src/com/jpexs/decompiler/flash/action/ActionList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java index 0d8a87404..63b11eddb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionList.java @@ -141,7 +141,7 @@ public class ActionList extends ArrayList { @Override public void remove() { - throw UnsupportedOperationException(); + throw new UnsupportedOperationException(); } }; } From 94de1e011e9c3182cb35f1b6b56408698362dfff Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Wed, 27 Aug 2014 04:01:56 +0800 Subject: [PATCH 3/3] Fix case issues in filenames --- .../flash/console/CommandLineArgumentParser.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java index 73209384c..26bd29d94 100644 --- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java +++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java @@ -267,12 +267,12 @@ public class CommandLineArgumentParser { double zoom = 1; Selection selection = new Selection(); Selection selectionIds = new Selection(); - String nextParam; + String nextParam = null, nextParamOriginal = null; OUTER: while (true) { - nextParam = args.remove(); - if (nextParam != null) { - nextParam = nextParam.toLowerCase(); + nextParamOriginal = args.remove(); + if (nextParamOriginal != null) { + nextParam = nextParamOriginal.toLowerCase(); } switch (nextParam) { case "-selectid": @@ -357,7 +357,7 @@ public class CommandLineArgumentParser { printCmdLineUsage(); System.exit(0); } else if (args.isEmpty()) { - return nextParam; + return nextParamOriginal; // file names should be the original one } else { badArguments(); }