diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 4824b802..99f26c02 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/core/.classpath b/core/.classpath index b345b80b..e7a46736 100644 --- a/core/.classpath +++ b/core/.classpath @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/.settings/org.eclipse.core.resources.prefs b/core/.settings/org.eclipse.core.resources.prefs index 365bbd60..99f26c02 100644 --- a/core/.settings/org.eclipse.core.resources.prefs +++ b/core/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,2 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9cfef2dd..00000000 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 -org.eclipse.jdt.core.compiler.compliance=9 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=9 diff --git a/core/.settings/org.eclipse.m2e.core.prefs b/core/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/core/.settings/org.eclipse.m2e.core.prefs +++ b/core/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/core/src/main/java/it/cavallium/warppi/boot/Boot.java b/core/src/main/java/it/cavallium/warppi/boot/Boot.java index 02a748d6..be4a9ea3 100644 --- a/core/src/main/java/it/cavallium/warppi/boot/Boot.java +++ b/core/src/main/java/it/cavallium/warppi/boot/Boot.java @@ -33,7 +33,7 @@ public class Boot { public static StartupArguments parseStartupArguments(final String[] a) { final StartupArgumentsImpl args = new StartupArgumentsImpl(); - Arrays.asList(a).stream().parallel().map(String::toLowerCase).forEach(arg -> Boot.parseArgument(args, arg)); + Arrays.asList(a).stream().parallel().filter((x) -> x != null).map(String::toLowerCase).forEach(arg -> Boot.parseArgument(args, arg)); return args; } @@ -73,7 +73,8 @@ public class Boot { args.setUncached(true); break; default: - Engine.getPlatform().getConsoleUtils().out().println("Unrecognized argument " + arg); + // Not using ConsoleUtils because it isn't initialized at this point. + System.out.println("Unrecognized argument " + arg); break; } } diff --git a/desktop/.classpath b/desktop/.classpath index eb124529..e7a46736 100644 --- a/desktop/.classpath +++ b/desktop/.classpath @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop/.settings/org.eclipse.core.resources.prefs b/desktop/.settings/org.eclipse.core.resources.prefs index cf6931b9..abdea9ac 100644 --- a/desktop/.settings/org.eclipse.core.resources.prefs +++ b/desktop/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,4 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/desktop/.settings/org.eclipse.jdt.core.prefs b/desktop/.settings/org.eclipse.jdt.core.prefs index 967e92e1..da524189 100644 --- a/desktop/.settings/org.eclipse.jdt.core.prefs +++ b/desktop/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 -org.eclipse.jdt.core.compiler.compliance=10 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=10 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=10 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=10 diff --git a/desktop/.settings/org.eclipse.m2e.core.prefs b/desktop/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/desktop/.settings/org.eclipse.m2e.core.prefs +++ b/desktop/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/desktop/pom.xml b/desktop/pom.xml index 45dd9d1e..7c2142d8 100644 --- a/desktop/pom.xml +++ b/desktop/pom.xml @@ -10,7 +10,7 @@ warppi-desktop - jar + pom WarpPI Calculator Desktop WarpPI Calculator desktop project diff --git a/engine-jogl/.settings/org.eclipse.core.resources.prefs b/engine-jogl/.settings/org.eclipse.core.resources.prefs index e9441bb1..99f26c02 100644 --- a/engine-jogl/.settings/org.eclipse.core.resources.prefs +++ b/engine-jogl/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 encoding/=UTF-8 diff --git a/engine-jogl/.settings/org.eclipse.jdt.core.prefs b/engine-jogl/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1ed387a4..00000000 --- a/engine-jogl/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 -org.eclipse.jdt.core.compiler.compliance=9 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=9 diff --git a/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java b/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java index 50b3c7d8..9f48170c 100644 --- a/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java +++ b/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java @@ -96,14 +96,10 @@ class NEWTWindow implements GLEventListener { onRealResize = BehaviorSubject.create(new Integer[] { (int) (StaticVars.screenSize[0] * windowZoom), (int) (StaticVars.screenSize[1] * windowZoom) }); onRealResize.subscribe((realSize) -> { - System.err.println("[[[SET REALWINDOWZOOM"); realWindowSize[0] = realSize[0]; realWindowSize[1] = realSize[1]; disp.size[0] = realSize[0] / (int) windowZoom; disp.size[1] = realSize[1] / (int) windowZoom; - System.err.println("[[[" + realWindowSize[0]); - System.err.println("[[[" + windowZoom); - System.err.println("[[[" + disp.size[0]); onResizeEvent.onNext(new Integer[] { disp.size[0], disp.size[1] }); refreshViewport = true; }); @@ -117,10 +113,6 @@ class NEWTWindow implements GLEventListener { disp.size[1] = (int) (realWindowSize[1] / windowZoom); StaticVars.screenSize[0] = disp.size[0]; StaticVars.screenSize[1] = disp.size[1]; - System.err.println("[[[SET WINDOWZOOM"); - System.err.println("[[[" + realWindowSize[0]); - System.err.println("[[[" + windowZoom); - System.err.println("[[[A:" + disp.size[0]); refreshViewport = true; } }); diff --git a/hardware/.classpath b/hardware/.classpath index cd5f6472..5e65e726 100644 --- a/hardware/.classpath +++ b/hardware/.classpath @@ -1,27 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hardware/.settings/org.eclipse.core.resources.prefs b/hardware/.settings/org.eclipse.core.resources.prefs index 654c1750..e9441bb1 100644 --- a/hardware/.settings/org.eclipse.core.resources.prefs +++ b/hardware/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding/=UTF-8 diff --git a/hardware/.settings/org.eclipse.jdt.core.prefs b/hardware/.settings/org.eclipse.jdt.core.prefs index 967e92e1..da524189 100644 --- a/hardware/.settings/org.eclipse.jdt.core.prefs +++ b/hardware/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 -org.eclipse.jdt.core.compiler.compliance=10 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=10 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=10 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=10 diff --git a/hardware/.settings/org.eclipse.m2e.core.prefs b/hardware/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/hardware/.settings/org.eclipse.m2e.core.prefs +++ b/hardware/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/hardware/pom.xml b/hardware/pom.xml index 22e5800f..23c38666 100644 --- a/hardware/pom.xml +++ b/hardware/pom.xml @@ -10,7 +10,7 @@ warppi-hardware - jar + pom WarpPI Calculator Hardware WarpPI Calculator hardware project diff --git a/pom.xml b/pom.xml index 787b1fa8..46f2e7c8 100755 --- a/pom.xml +++ b/pom.xml @@ -89,13 +89,13 @@ junit junit - 3.8.1 + 4.12 test it.unimi.dsi fastutil - 8.2.1 + 8.2.2 com.google.code.gson @@ -110,7 +110,7 @@ org.apache.commons commons-lang3 - 3.8 + 3.8.1 ar.com.hjg @@ -134,9 +134,7 @@ maven-compiler-plugin 3.8.0 - ${maven.compiler.source} - ${maven.compiler.target} - ${maven.compiler.release} + 11 @@ -156,12 +154,17 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + 2.22.0 + + + --illegal-access=permit + + org.apache.felix maven-bundle-plugin - 2.5.3 + 2.5.4 org.apache.maven.plugins @@ -170,5 +173,45 @@ + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + false + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.0 + + + --illegal-access=permit + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M2 + + + enforce-maven + + enforce + + + + + 3.0 + + + + + + + diff --git a/rules/.settings/org.eclipse.core.resources.prefs b/rules/.settings/org.eclipse.core.resources.prefs index 654c1750..99f26c02 100644 --- a/rules/.settings/org.eclipse.core.resources.prefs +++ b/rules/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/rules/.settings/org.eclipse.jdt.core.prefs b/rules/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9cfef2dd..00000000 --- a/rules/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 -org.eclipse.jdt.core.compiler.compliance=9 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=9 diff --git a/rules/.settings/org.eclipse.m2e.core.prefs b/rules/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/rules/.settings/org.eclipse.m2e.core.prefs +++ b/rules/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/teavm/.classpath b/teavm/.classpath index e1938397..5e65e726 100644 --- a/teavm/.classpath +++ b/teavm/.classpath @@ -1,27 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teavm/.settings/org.eclipse.core.resources.prefs b/teavm/.settings/org.eclipse.core.resources.prefs index 654c1750..e9441bb1 100644 --- a/teavm/.settings/org.eclipse.core.resources.prefs +++ b/teavm/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding/=UTF-8 diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs index f494d1de..29780679 100644 --- a/teavm/.settings/org.eclipse.jdt.core.prefs +++ b/teavm/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=9 diff --git a/teavm/.settings/org.eclipse.m2e.core.prefs b/teavm/.settings/org.eclipse.m2e.core.prefs index 14b697b7..f897a7f1 100644 --- a/teavm/.settings/org.eclipse.m2e.core.prefs +++ b/teavm/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/teavm/pom.xml b/teavm/pom.xml index 18747d4c..f4cb4f12 100644 --- a/teavm/pom.xml +++ b/teavm/pom.xml @@ -9,14 +9,8 @@ ${project.version} warppi-teavm - jar + pom - - 1.8 - 1.8 - 1.8 - 1.8 - WarpPI Calculator TeaVM WarpPI Calculator teavm project diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java index a3befe43..1e8ff326 100644 --- a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java @@ -4,8 +4,12 @@ import it.cavallium.warppi.boot.Boot; public class TeaVMBoot { - public static void main(final String[] args) throws Exception { - Boot.boot(new TeaVMPlatform(), args); + public static void main(final String[] args) { + try { + Boot.boot(new TeaVMPlatform(), args); + } catch (Exception e) { + e.printStackTrace(); + } } }