diff --git a/build.properties b/build.properties
index 2e6894084..12037cc11 100644
--- a/build.properties
+++ b/build.properties
@@ -75,8 +75,8 @@ src.dir = src
resources.dir = resources
test.dir = test
test.lib.dir = testlib
-test.results.dir = reports/tests
-coverage.results.dir = reports/coverage
+test.result.dir = reports/tests
+coverage.result.dir = reports/coverage
dist.dir = dist
compile.dir = build/classes
coverage.dir = coverage
diff --git a/build.xml b/build.xml
index c1bac1aee..d7d38a293 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
-
+
@@ -20,7 +20,6 @@
-
@@ -117,16 +116,16 @@
-
-
-
+
+
+
@@ -141,7 +140,7 @@
-
+
@@ -154,7 +153,7 @@
-
+
@@ -776,7 +775,7 @@
-
+
@@ -784,9 +783,9 @@
Must select one file in the IDE or set test.class
Must select some method in the IDE or set test.method
-
-
-
+
+
+
@@ -797,7 +796,7 @@
diff --git a/libsrc/ffdec_lib/testlib/jacocoant.jar b/libsrc/ffdec_lib/antlib/jacocoant.jar
similarity index 100%
rename from libsrc/ffdec_lib/testlib/jacocoant.jar
rename to libsrc/ffdec_lib/antlib/jacocoant.jar
diff --git a/libsrc/ffdec_lib/jflex-1.6.0.jar b/libsrc/ffdec_lib/antlib/jflex-1.6.0.jar
similarity index 100%
rename from libsrc/ffdec_lib/jflex-1.6.0.jar
rename to libsrc/ffdec_lib/antlib/jflex-1.6.0.jar
diff --git a/libsrc/ffdec_lib/antlib/testng-6.8.jar b/libsrc/ffdec_lib/antlib/testng-6.8.jar
new file mode 100644
index 000000000..dd6c8bbf3
Binary files /dev/null and b/libsrc/ffdec_lib/antlib/testng-6.8.jar differ
diff --git a/libsrc/ffdec_lib/build.properties b/libsrc/ffdec_lib/build.properties
index 1cbbe9bf8..e3a6f809d 100644
--- a/libsrc/ffdec_lib/build.properties
+++ b/libsrc/ffdec_lib/build.properties
@@ -9,8 +9,8 @@ target.java = 1.8
src.dir = src
test.dir = test
test.lib.dir = testlib
-test.results.dir = reports/tests
-coverage.results.dir = reports/coverage
+test.result.dir = reports/tests
+coverage.result.dir = reports/coverage
dist.dir = dist
compile.dir = build/classes
coverage.dir = coverage
@@ -19,4 +19,5 @@ lib.dir = ../../lib
properties.name = project.properties
dist.lib.dirname = lib
javadoc.dir = javadoc
-lexers.dir = lexers
\ No newline at end of file
+lexers.dir = lexers
+ant.lib.dir = antlib
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/build.xml b/libsrc/ffdec_lib/build.xml
index 2585f0928..aaa2548b2 100644
--- a/libsrc/ffdec_lib/build.xml
+++ b/libsrc/ffdec_lib/build.xml
@@ -7,6 +7,15 @@
+
+
+
+
+
+
+
+
+
Builds project
@@ -27,9 +36,7 @@
-
-
-
+
@@ -75,10 +82,7 @@
-
-
-
-
+
-
+
@@ -110,7 +114,7 @@
-
+
@@ -223,8 +227,7 @@
-
-
+
@@ -247,7 +250,6 @@
-
diff --git a/libsrc/ffdec_lib/build_common.xml b/libsrc/ffdec_lib/build_common.xml
deleted file mode 100644
index 4b830f4eb..000000000
--- a/libsrc/ffdec_lib/build_common.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
- Builds project
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set test.class
- Must select some method in the IDE or set test.method
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libsrc/ffdec_lib/nbproject/ide-file-targets.xml b/libsrc/ffdec_lib/nbproject/ide-file-targets.xml
index 0eb4fcdef..07d291025 100644
--- a/libsrc/ffdec_lib/nbproject/ide-file-targets.xml
+++ b/libsrc/ffdec_lib/nbproject/ide-file-targets.xml
@@ -1,21 +1,189 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Must set property 'run.class'
+
+
+
+
+
-
+
+ Must set property 'run.class'
+
+
+
+
+
+
+
+
+
+ Must set property 'test.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'test.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'profile.class'
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml
index 196291231..634fd0434 100644
--- a/libsrc/ffdec_lib/nbproject/project.xml
+++ b/libsrc/ffdec_lib/nbproject/project.xml
@@ -52,11 +52,136 @@ auxiliary.show.customizer.message=
clean
build
-
+
-
+
debug-nb
+
+
+ profile
+
+
+
+ run-selected-file-in-src
+
+ run.class
+ src
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ run-selected-file-in-test
+
+ run.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ debug-selected-file-in-src
+
+ debug.class
+ src
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-selected-file
+
+ test.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-selected-method
+
+ test.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-debug-selected-method
+
+ debug.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-debug-selected-file
+
+ debug.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ profile-nb
+
+
+
+ profile-selected-file-in-src
+
+ profile.class
+ src
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ debug-selected-file-in-test
+
+ debug.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
folder
@@ -89,6 +214,12 @@ auxiliary.show.customizer.message=
build.properties
+
+ nbproject/project.xml
+
+
+ nbproject/ide-file-targets.xml
+
@@ -114,7 +245,7 @@ auxiliary.show.customizer.message=
test
- ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jl1.0.1.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;testlib/emma.jar;testlib/emma_ant.jar;testlib/testng-6.8.jar;src
+ ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jl1.0.1.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;antlib/testng-6.8.jar;src
1.8
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100644
index dbe85518b..000000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/jdk.xml.data.CRC32=4f166e73
-nbproject/jdk.xml.script.CRC32=5342cb35
-nbproject/jdk.xml.stylesheet.CRC32=b5c68e1e@1.38.1
diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index b212bfff3..07d291025 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -1,72 +1,189 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Must set property 'run.class'
-
- >
-
+
+
+
-
-
-
+
Must set property 'run.class'
+
+
+
+
+
+
+
+
+ Must set property 'test.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'test.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
-
-
-
-
-
-
- Must set property 'debug.class'
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+ Must set property 'debug.class'
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+ Must set property 'profile.class'
+
+
+
+
+
+
+
+
-
-
-
-
+
\ No newline at end of file
diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml
index 0b16157a0..ab8db7552 100644
--- a/nbproject/ide-targets.xml
+++ b/nbproject/ide-targets.xml
@@ -1,10 +1,33 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nbproject/jdk.xml b/nbproject/jdk.xml
deleted file mode 100644
index a88697822..000000000
--- a/nbproject/jdk.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
- Permits selection of a JDK to use when building and running project.
- See: http://www.netbeans.org/issues/show_bug.cgi?id=64160
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- nbjdk.active=${nbjdk.active} nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac} nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath} nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4} have-jdk-1.5=${have-jdk-1.5}
-
-
-
-
- Warning: nbjdk.active=${nbjdk.active} or nbjdk.home=${nbjdk.home} is an invalid Java platform; ignoring and using ${jdkhome.presumed}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/nbproject/nbjdk.properties b/nbproject/nbjdk.properties
deleted file mode 100644
index 2ac925db8..000000000
--- a/nbproject/nbjdk.properties
+++ /dev/null
@@ -1 +0,0 @@
-nbjdk.active=JDK_1.8
diff --git a/nbproject/nbjdk.xml b/nbproject/nbjdk.xml
deleted file mode 100644
index 4ead64b81..000000000
--- a/nbproject/nbjdk.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 71f228f46..80a24ea25 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -48,40 +48,30 @@
-
build
-
clean
-
javadoc
-
run
-
test
-
clean
build
-
-
- profile-nb
-
-
+
debug-nb
-
+
-
+
run-selected-file-in-src
run.class
@@ -94,7 +84,7 @@
-
+
run-selected-file-in-test
run.class
@@ -107,7 +97,89 @@
-
+
+ debug-selected-file-in-src
+
+ debug.class
+ src
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-selected-file
+
+ test.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-selected-method
+
+ test.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-debug-selected-method
+
+ debug.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ test-debug-selected-file
+
+ debug.class
+ test
+ \.java$
+ java-name
+
+
+
+
+
+
+
+ profile-nb
+
+
+
+ profile-selected-file-in-src
+
+ profile.class
+ src
+ \.java$
+ java-name
+
+
+
+
+
+
+
debug-selected-file-in-test
debug.class
@@ -122,44 +194,12 @@
folder
- build
-
- build
-
-
- folder
- javadoc
-
- build
-
-
- folder
- reports
-
- build
-
-
- folder
- locales
-
- build
-
-
- folder
- reports
-
- build
-
-
- folder
- dist
-
+ build/classes
build
folder
build/test
-
build
@@ -173,15 +213,15 @@
test
-
+
libsrc/ffdec_lib/src
-
+
libsrc/ffdec_lib/test
-
+
libsrc/ffdec_lib/lexers
@@ -195,7 +235,16 @@
jpexs_website.properties
-
+
+
+ nbproject/project.xml
+
+
+ nbproject/ide-file-targets.xml
+
+
+ nbproject/ide-targets.xml
+
diff --git a/test/SampleTest.java b/test/SampleTest.java
deleted file mode 100644
index f4e8d7c39..000000000
--- a/test/SampleTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010-2015 JPEXS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package sample;
-
-import org.testng.annotations.Test;
-
-/**
- *
- * @author JPEXS
- */
-public class SampleTest {
-
- @Test
- public void testDecompilePcode() {
- System.out.println("Hello, this is a test");
- }
-}
diff --git a/test/AdvancedSettingsTest.java b/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java
similarity index 97%
rename from test/AdvancedSettingsTest.java
rename to test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java
index 3629412b2..bfe88c448 100644
--- a/test/AdvancedSettingsTest.java
+++ b/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java
@@ -1,36 +1,37 @@
-
-import com.jpexs.decompiler.flash.gui.AdvancedSettingsDialog;
-import com.jpexs.decompiler.flash.gui.AppStrings;
-import java.util.HashMap;
-import java.util.ResourceBundle;
-import javax.swing.JComboBox;
-import org.testng.annotations.Test;
-
-/*
- * Copyright (C) 2010-2015 JPEXS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-/**
- *
- * @author JPEXS
- */
-public class AdvancedSettingsTest {
-
- @Test
- public void testAdvancedSettginsDialog() {
- ResourceBundle resourceBundle = ResourceBundle.getBundle(AppStrings.getResourcePath(AdvancedSettingsDialog.class));
- AdvancedSettingsDialog.getCategories(new HashMap<>(), new HashMap<>(), new JComboBox<>(), resourceBundle);
- }
-}
+package com.jpexs.decompiler.flash.gui;
+
+import com.jpexs.decompiler.flash.gui.AdvancedSettingsDialog;
+import com.jpexs.decompiler.flash.gui.AppStrings;
+import java.util.HashMap;
+import java.util.ResourceBundle;
+import javax.swing.JComboBox;
+import org.testng.annotations.Test;
+
+/*
+ * Copyright (C) 2010-2015 JPEXS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+/**
+ *
+ * @author JPEXS
+ */
+public class AdvancedSettingsTest {
+
+ @Test
+ public void testAdvancedSettginsDialog() {
+ ResourceBundle resourceBundle = ResourceBundle.getBundle(AppStrings.getResourcePath(AdvancedSettingsDialog.class));
+ AdvancedSettingsDialog.getCategories(new HashMap<>(), new HashMap<>(), new JComboBox<>(), resourceBundle);
+ }
+}