diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 00000000..2c4ea32b
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 41b28c54..0266f92b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,8 +9,5 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fa5152dc..3a12f539 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,15 +21,15 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml
new file mode 100644
index 00000000..966d5f56
--- /dev/null
+++ b/.idea/jpa-buddy.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..a6c786c0
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4a19bd38..12e5039c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
+
-
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 624adda1..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dbf72ed8..f0b84f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.openbase
bco.bcozy
- 2.0-SNAPSHOT
+ 3.1-SNAPSHOT
BCO BCozy
2015
@@ -102,19 +102,10 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.1
-
- ${java.source.version}
- ${java.target.version}
-
-
org.codehaus.mojo
exec-maven-plugin
- 1.6.0
+ 3.1.0
java
@@ -122,7 +113,7 @@
org.codehaus.mojo
appassembler-maven-plugin
- 2.0.0
+ 2.1.0
install
@@ -147,7 +138,7 @@
com.zenjava
javafx-maven-plugin
- 8.1.4
+ 8.8.3
org.openbase.bco.bcozy.BCozyLauncher
true
@@ -156,7 +147,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.1.0
+ 3.3.0
@@ -185,7 +176,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.0
attach-sources
@@ -198,7 +189,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ ${plugin.javadoc.version}
${java.source.version}
@@ -211,6 +202,69 @@
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${kotlin.version}
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ src/main/java
+ target/generated-sources/annotations
+
+
+
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
+
+
+ 1.8
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.11.0
+
+
+ default-compile
+ none
+
+
+ default-testCompile
+ none
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ testCompile
+ test-compile
+
+ testCompile
+
+
+
+
+ ${java.source.version}
+ ${java.target.version}
+
+
@@ -242,7 +296,7 @@
org.apache.maven.plugins
maven-release-plugin
- 2.5.3
+ 3.0.1
true
true
@@ -260,7 +314,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 1.6
+ 3.1.0
sign-artifacts
@@ -274,7 +328,7 @@
org.sonatype.plugins
nexus-staging-maven-plugin
- 1.6.8
+ 1.6.13
true
ossrh
@@ -293,12 +347,13 @@
17
17
2.15
- 2.10.3
- [1.2,1.3-alpha)
+ 3.5.0
+ [1.4,1.5-alpha)
3.1-SNAPSHOT
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
${dependency.bco.version}
${dependency.bco.version}
+ 1.9.20
@@ -327,7 +382,7 @@
org.junit.jupiter
junit-jupiter-api
- 5.6.2
+ 5.10.0
test
@@ -335,7 +390,7 @@
org.junit.vintage
junit-vintage-engine
- 5.6.2
+ 5.10.0
test
@@ -383,21 +438,47 @@
org.openjfx
javafx-swing
- 11.0.2
+ 17.0.9
linux
org.openjfx
javafx-web
- 11.0.2
+ 17.0.9
linux
+
+
+ org.openjfx
+ javafx-swing
+ 17.0.9
+ win
+
+
+ org.openjfx
+ javafx-web
+ 17.0.9
+ win
+
+
+
+ org.openjfx
+ javafx-swing
+ 17.0.9
+ mac
+
+
+ org.openjfx
+ javafx-web
+ 17.0.9
+ mac
+
eu.hansolo
tilesfx
- 11.1
+ 17.1.21
@@ -406,6 +487,17 @@
charts
1.0.5
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ ${kotlin.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-test
+ ${kotlin.version}
+ test
+
diff --git a/src/main/java/org/openbase/bco/bcozy/controller/ContextMenuController.java b/src/main/java/org/openbase/bco/bcozy/controller/ContextMenuController.java
index eff647e1..8ba14916 100644
--- a/src/main/java/org/openbase/bco/bcozy/controller/ContextMenuController.java
+++ b/src/main/java/org/openbase/bco/bcozy/controller/ContextMenuController.java
@@ -81,13 +81,14 @@ public ContextMenuController(final ForegroundPane foregroundPane, final Location
final UnitMenu unitMenu = foregroundPane.getUnitMenu();
- try {
- powerTerminalSidebarPaneAndController = FXMLProcessor.loadFxmlPaneAndControllerPair(PowerTerminalSidebarPaneController.class);
+// This part is disabled since the power terminal uses some outdated libs that are no longer supported by java 17
+// try {
+// powerTerminalSidebarPaneAndController = FXMLProcessor.loadFxmlPaneAndControllerPair(PowerTerminalSidebarPaneController.class);
// ((PowerTerminalSidebarPaneController) powerTerminalSidebarPaneAndController.getValue()).init(unitMenu);
- unitMenu.setPowerTerminalSidebarPane(powerTerminalSidebarPaneAndController.getKey());
- } catch (final CouldNotPerformException ex) {
- ExceptionPrinter.printHistory("Content could not be loaded", ex, LOGGER);
- }
+// unitMenu.setPowerTerminalSidebarPane(powerTerminalSidebarPaneAndController.getKey());
+// } catch (final CouldNotPerformException ex) {
+// ExceptionPrinter.printHistory("Content could not be loaded", ex, LOGGER);
+// }
BCozy.appModeProperty.addListener((observable, oldValue, newValue) -> {
switch (newValue) {
diff --git a/src/main/java/org/openbase/bco/bcozy/controller/UserManagementController.java b/src/main/java/org/openbase/bco/bcozy/controller/UserManagementController.java
index 77336f6e..7e3756b0 100644
--- a/src/main/java/org/openbase/bco/bcozy/controller/UserManagementController.java
+++ b/src/main/java/org/openbase/bco/bcozy/controller/UserManagementController.java
@@ -1,7 +1,6 @@
package org.openbase.bco.bcozy.controller;
import com.jfoenix.controls.JFXCheckBox;
-import com.sun.javafx.tk.Toolkit;
import javafx.application.Platform;
import javafx.beans.property.StringProperty;
import javafx.collections.ListChangeListener;
@@ -167,8 +166,6 @@ private void fillUserList() {
}
private void fillUserListInternal() {
- Toolkit.getToolkit().checkFxUserThread();
-
UserData userData = selectedUser;
chooseUserBox.getItems().clear();
@@ -209,8 +206,6 @@ private void userSelected(UserData selectedUser) {
}
private void userSelectedInternal(UserData selectedUser) {
- Toolkit.getToolkit().checkFxUserThread();
-
unbindFields();
resetFields();
resetHints();
diff --git a/src/main/java/org/openbase/bco/bcozy/view/InfoPane.java b/src/main/java/org/openbase/bco/bcozy/view/InfoPane.java
index 294acf7d..59595faf 100644
--- a/src/main/java/org/openbase/bco/bcozy/view/InfoPane.java
+++ b/src/main/java/org/openbase/bco/bcozy/view/InfoPane.java
@@ -18,7 +18,6 @@
*/
package org.openbase.bco.bcozy.view;
-import com.sun.javafx.application.PlatformImpl;
import javafx.animation.KeyFrame;
import javafx.animation.Timeline;
import javafx.application.Platform;
@@ -167,7 +166,7 @@ private InfoPaneConfigurer() {
* @param duration the duration
*/
public InfoPaneConfigurer hideAfter(Duration duration) {
- PlatformImpl.runLater(() -> {
+ Platform.runLater(() -> {
try {
InfoPane.getInstance().resetTimeline();
InfoPane.getInstance().timeline = new Timeline(new KeyFrame(duration, e -> InfoPane.hide()));
@@ -180,7 +179,7 @@ public InfoPaneConfigurer hideAfter(Duration duration) {
}
public InfoPaneConfigurer backgroundColor(Color color) {
- PlatformImpl.runLater(() -> {
+ Platform.runLater(() -> {
try {
InfoPane.getInstance().setBackground(new Background(new BackgroundFill(color, CornerRadii.EMPTY, Insets.EMPTY)));
} catch (NotAvailableException ex) {
diff --git a/src/main/resources/jpro.conf b/src/main/resources/jpro.conf
deleted file mode 100644
index b4d22ba7..00000000
--- a/src/main/resources/jpro.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-jpro.applications {
- "bcozy" = org.openbase.bco.bcozy.BCozy
-}
\ No newline at end of file