diff --git a/Flow b/Flow
index c58460e4..aa1984f1 160000
--- a/Flow
+++ b/Flow
@@ -1 +1 @@
-Subproject commit c58460e49af4036df9eecb8cac7be38717cbb29e
+Subproject commit aa1984f1d386324712f2562f95620679ea5dde6c
diff --git a/core/.classpath b/core/.classpath
index e1133bcb..61560899 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -18,7 +18,7 @@
-
+
diff --git a/core/pom.xml b/core/pom.xml
index f5dfc0f8..d163a214 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
${project.version}
warppi-core
- jar
+ bundle
WarpPI Calculator Core
WarpPI Calculator core project
@@ -45,6 +45,18 @@
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ *
+ it.cavallium.warppi.*
+ warppi-core
+
+
+
org.apache.maven.plugins
maven-source-plugin
diff --git a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
index f6654b73..08faeac0 100644
--- a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
+++ b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java
@@ -127,16 +127,16 @@ public final class DisplayManager implements RenderingLoop {
Engine.getPlatform().getConsoleUtils().out().println(1, "Using FB Graphic Engine");
return d;
}
- d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "GPU engine", null);
- if (d != null && d.isSupported()) {
- Engine.getPlatform().getConsoleUtils().out().println(1, "Using GPU Graphic Engine");
- return d;
- }
d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "CPU engine", null);
if (d != null && d.isSupported()) {
Engine.getPlatform().getConsoleUtils().out().println(1, "Using CPU Graphic Engine");
return d;
}
+ d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "GPU engine", null);
+ if (d != null && d.isSupported()) {
+ Engine.getPlatform().getConsoleUtils().out().println(1, "Using GPU Graphic Engine");
+ return d;
+ }
d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "headless 24 bit engine", null);
if (d != null && d.isSupported()) {
System.err.println("Using Headless 24 bit Engine! This is a problem! No other graphic engines are available.");
diff --git a/core/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java b/core/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
index 78086030..e536030f 100644
--- a/core/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
+++ b/core/src/main/java/it/cavallium/warppi/math/rules/RulesManager.java
@@ -178,7 +178,7 @@ public class RulesManager {
Engine.getPlatform().getStorageUtils();
Engine.getPlatform().getStorageUtils();
Engine.getPlatform().getStorageUtils().write(tFileJava, javaCode.getBytes("UTF-8"), StorageUtils.OpenOptionWrite, StorageUtils.OpenOptionCreate);
- final boolean compiled = Engine.getPlatform().compile(new String[] { "-nowarn", "-10", tFileJava.toString() }, new PrintWriter(System.out), new PrintWriter(System.err));
+ final boolean compiled = Engine.getPlatform().compile(new String[] { "-nowarn", "-1.8", "-proc:none", tFileJava.toString() }, new PrintWriter(System.out), new PrintWriter(System.err));
if (StaticVars.startupArguments.isUncached()) {
tFileJava.deleteOnExit();
} else {
diff --git a/desktop/.classpath b/desktop/.classpath
index e1133bcb..e33daad6 100644
--- a/desktop/.classpath
+++ b/desktop/.classpath
@@ -18,12 +18,12 @@
-
+
-
+
diff --git a/desktop/.settings/org.eclipse.jdt.core.prefs b/desktop/.settings/org.eclipse.jdt.core.prefs
index 54a32cd5..b8947ec6 100644
--- a/desktop/.settings/org.eclipse.jdt.core.prefs
+++ b/desktop/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,6 @@
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.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=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/desktop/math-rules-cache.zip b/desktop/math-rules-cache.zip
index 47361c37..59eb8056 100644
Binary files a/desktop/math-rules-cache.zip and b/desktop/math-rules-cache.zip differ
diff --git a/desktop/pom.xml b/desktop/pom.xml
index 4c30b668..b3c78995 100644
--- a/desktop/pom.xml
+++ b/desktop/pom.xml
@@ -10,7 +10,7 @@
warppi-desktop
- jar
+ bundle
WarpPI Calculator Desktop
WarpPI Calculator desktop project
@@ -59,6 +59,19 @@
org.apache.maven.plugins
maven-source-plugin
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ *
+ it.cavallium.warppi.*
+ warppi-desktop
+
+
+
org.apache.maven.plugins
diff --git a/desktop/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/swing/SwingAdvancedButton.java b/desktop/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/swing/SwingAdvancedButton.java
index 94f4cc81..c312eb50 100644
--- a/desktop/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/swing/SwingAdvancedButton.java
+++ b/desktop/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/swing/SwingAdvancedButton.java
@@ -77,7 +77,7 @@ public class SwingAdvancedButton extends JButton {
g2d.setColor(super.getForeground());
int y = super.getHeight() / 2 + g.getFontMetrics().getHeight() / 4;
if (state == 2) {
- y += 8;
+ y += 4;
}
g2d.drawString(getText(), super.getWidth() / 2 - g.getFontMetrics().stringWidth(getText()) / 2, y);
g2d.dispose();
diff --git a/engine-jogl/.classpath b/engine-jogl/.classpath
index 3554a9a9..f3872e63 100644
--- a/engine-jogl/.classpath
+++ b/engine-jogl/.classpath
@@ -8,13 +8,8 @@
-
-
-
-
-
-
+
@@ -23,5 +18,10 @@
+
+
+
+
+
diff --git a/engine-jogl/.settings/org.eclipse.core.resources.prefs b/engine-jogl/.settings/org.eclipse.core.resources.prefs
index e9441bb1..f9fe3459 100644
--- a/engine-jogl/.settings/org.eclipse.core.resources.prefs
+++ b/engine-jogl/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
encoding/=UTF-8
diff --git a/engine-jogl/pom.xml b/engine-jogl/pom.xml
index 18e68247..76422426 100644
--- a/engine-jogl/pom.xml
+++ b/engine-jogl/pom.xml
@@ -10,7 +10,7 @@
warppi-engine-jogl
- jar
+ bundle
WarpPI Calculator JOGL Engine
WarpPI Calculator engine-jogl project
@@ -37,6 +37,18 @@
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ *
+ it.cavallium.warppi.*
+ warppi-engine-jogl
+
+
+
org.apache.maven.plugins
maven-source-plugin
diff --git a/hardware/.classpath b/hardware/.classpath
index 7e73236e..f3872e63 100644
--- a/hardware/.classpath
+++ b/hardware/.classpath
@@ -13,12 +13,12 @@
-
+
-
+
diff --git a/hardware/.settings/org.eclipse.jdt.core.prefs b/hardware/.settings/org.eclipse.jdt.core.prefs
index 54a32cd5..b8947ec6 100644
--- a/hardware/.settings/org.eclipse.jdt.core.prefs
+++ b/hardware/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,6 @@
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.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=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/math-rules-cache.zip b/math-rules-cache.zip
deleted file mode 100644
index 0741dd49..00000000
Binary files a/math-rules-cache.zip and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 273d3b56..50ab7069 100755
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,6 @@
UTF-8
1.8
1.8
- 1.8
1.8
src/main/java
src/main/java
@@ -43,7 +42,7 @@
core
Flow
rules
- hardware
+
desktop
engine-jogl
teavm
@@ -82,6 +81,11 @@
default
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/releases/
+ default
+
@@ -134,7 +138,8 @@
maven-compiler-plugin
3.8.0
- ${maven.compiler.release}
+
+ ${maven.compiler.target}
@@ -155,16 +160,11 @@
org.apache.maven.plugins
maven-surefire-plugin
2.22.0
-
-
- --illegal-access=permit
-
-
org.apache.felix
maven-bundle-plugin
- 2.5.4
+ 3.5.1
org.apache.maven.plugins
diff --git a/rules/.classpath b/rules/.classpath
index 3554a9a9..f3872e63 100644
--- a/rules/.classpath
+++ b/rules/.classpath
@@ -8,13 +8,8 @@
-
-
-
-
-
-
+
@@ -23,5 +18,10 @@
+
+
+
+
+
diff --git a/rules/.settings/org.eclipse.core.resources.prefs b/rules/.settings/org.eclipse.core.resources.prefs
index e9441bb1..f9fe3459 100644
--- a/rules/.settings/org.eclipse.core.resources.prefs
+++ b/rules/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
encoding/=UTF-8
diff --git a/rules/pom.xml b/rules/pom.xml
index 6e299086..85fdabb0 100644
--- a/rules/pom.xml
+++ b/rules/pom.xml
@@ -9,7 +9,7 @@
${project.version}
warppi-rules
- jar
+ bundle
WarpPI Calculator Rules
WarpPI Calculator rules project
@@ -24,6 +24,18 @@
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ *
+ it.cavallium.warppi.*
+ warppi-rules
+
+
+
org.apache.maven.plugins
maven-source-plugin
diff --git a/teavm/.classpath b/teavm/.classpath
index 7e73236e..d0e5faff 100644
--- a/teavm/.classpath
+++ b/teavm/.classpath
@@ -13,7 +13,7 @@
-
+
diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs
index 54a32cd5..b8947ec6 100644
--- a/teavm/.settings/org.eclipse.jdt.core.prefs
+++ b/teavm/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,6 @@
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.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=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/teavm/pom.xml b/teavm/pom.xml
index 87a30214..148a5f0a 100644
--- a/teavm/pom.xml
+++ b/teavm/pom.xml
@@ -10,13 +10,6 @@
warppi-teavm
jar
-
-
- 1.8
- 1.8
- 1.8
- 1.8
-
WarpPI Calculator TeaVM
WarpPI Calculator teavm project
@@ -70,12 +63,23 @@
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ *
+ it.cavallium.warppi.*
+ warppi-teavm
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
-
- ${maven.compiler.target}
+ ${maven.compiler.release}
UTF-8
@@ -94,6 +98,8 @@
true
true
true
+ true
+ FULL
diff --git a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
index f8f22535..e9f8d0fa 100644
--- a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
+++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
@@ -95,12 +95,12 @@ public class HtmlEngine implements GraphicEngine {
if (suppportsZoom()) {
canvas.setWidth((int)(480 / 1));
canvas.setHeight((int)(320 / 1));
- canvas.getStyle().setProperty("zoom", "" + (windowZoom + 1));
+ canvas.getStyle().setProperty("zoom", "" + (1 + 1));
} else {
canvas.setWidth((int)(480 * 2));
canvas.setHeight((int)(320 * 2));
}
- canvas.getStyle().setProperty("max-height", (int)(44 / windowZoom) + "vh");
+ canvas.getStyle().setProperty("max-height", (int)(44 / (1+1)) + "vh");
width = 480 / windowZoom.intValue();
height = 320 / windowZoom.intValue();
this.mult = windowZoom.intValue();
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..4bdd1056 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(String[] args) {
+ try {
+ Boot.boot(new TeaVMPlatform(), args);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}