From bb1bd567b3ee6d29266925e792fb6b6e5600ae53 Mon Sep 17 00:00:00 2001
From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com>
Date: Tue, 28 Apr 2020 23:54:27 +0200
Subject: [PATCH] revert to java 8
---
G-Earth/pom.xml | 32 +++++++++----------
.../extensionhandler/ExtensionHandler.java | 2 +-
.../uilogger/UiLoggerController.java | 1 -
pom.xml | 4 +--
4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/G-Earth/pom.xml b/G-Earth/pom.xml
index a945e2b..1d2d55f 100644
--- a/G-Earth/pom.xml
+++ b/G-Earth/pom.xml
@@ -11,7 +11,7 @@
1.0
- 11
+ 1.8
@@ -124,21 +124,21 @@
-
- org.openjfx
- javafx-fxml
- ${javafx.version}
-
-
- org.openjfx
- javafx-graphics
- ${javafx.version}
-
-
- org.openjfx
- javafx-web
- ${javafx.version}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.json
json
diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java b/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java
index 3ec62c6..0b5dd38 100644
--- a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java
+++ b/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java
@@ -20,7 +20,7 @@ public class ExtensionHandler {
private final List gEarthExtensions = new ArrayList<>();
private final HConnection hConnection;
private List extensionProducers;
- private Observable observable = new Observable<>() {
+ private Observable observable = new Observable() {
@Override
public void addListener(ExtensionConnectedListener extensionConnectedListener) {
super.addListener(extensionConnectedListener);
diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/uilogger/UiLoggerController.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/uilogger/UiLoggerController.java
index 7cfe2b3..23514c6 100644
--- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/uilogger/UiLoggerController.java
+++ b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/uilogger/UiLoggerController.java
@@ -69,7 +69,6 @@ public class UiLoggerController implements Initializable {
appendLater.clear();
}
}
-
}
private static String cleanTextContent(String text) {
diff --git a/pom.xml b/pom.xml
index 6cbd2e1..ab292df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
maven-compiler-plugin
3.7.0
-
- 11
+
+ 1.8