Merge pull request #2 from technagreek/jdk15-openjfx

Base version Java 15 with Open JFX 15
technagreek · Dec 7, 2020 · 18a017d · 18a017d
2 parents f066079 + 7ced988
commit 18a017d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/enchald.iml b/enchald.iml
diff --git a/pom.xml b/pom.xml
@@ -9,19 +9,38 @@
     <version>1.0.0.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
     </properties>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>15.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>15.0.1</version>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>15</source>
+                    <target>15</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.5</version>
+                <configuration>
+                    <mainClass>org.technagreek.java.enchald.main.AppLauncher</mainClass>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/main/java/org/technagreek/java/enchald/core/menubar/MenuBarController.java b/src/main/java/org/technagreek/java/enchald/core/menubar/MenuBarController.java
@@ -14,7 +14,7 @@
 public class MenuBarController {
   public void showSample1(Event event) throws IOException {
     BorderPane mainPanel = AppLauncher.getMainModule().getMainPane();
-    URL sample1FXML = this.getClass().getResource("../../modules/sample1/sample1.fxml");
+    URL sample1FXML = MenuBarController.class.getResource("/org/technagreek/java/enchald/modules/sample1/sample1.fxml");
 
     FXMLLoader loader = new FXMLLoader(sample1FXML);
 
@@ -24,7 +24,7 @@ public void showSample1(Event event) throws IOException {
 
   public void showSample2(Event event) throws IOException {
     BorderPane mainPanel = AppLauncher.getMainModule().getMainPane();
-    URL sample1FXML = this.getClass().getResource("../../modules/sample2/sample2.fxml");
+    URL sample1FXML = MenuBarController.class.getResource("/org/technagreek/java/enchald/modules/sample2/sample2.fxml");
 
     FXMLLoader loader = new FXMLLoader(sample1FXML);
 

diff --git a/src/main/java/org/technagreek/java/enchald/main/MainApplication.java b/src/main/java/org/technagreek/java/enchald/main/MainApplication.java
@@ -29,7 +29,7 @@ public class MainApplication extends Application implements MainModule {
 
   public static void showAbout() throws IOException {
     Stage stage = new Stage();
-    AnchorPane root = FXMLLoader.load(MainApplication.class.getResource("../core/help/About.fxml"));
+    AnchorPane root = FXMLLoader.load(MainApplication.class.getResource("/org/technagreek/java/enchald/core/help/About.fxml"));
     stage.setScene(new Scene(root));
     stage.setTitle("About");
     stage.initModality(Modality.WINDOW_MODAL);

diff --git a/src/main/java/org/technagreek/java/enchald/main/MainController.java b/src/main/java/org/technagreek/java/enchald/main/MainController.java
@@ -1,5 +1,6 @@
 package org.technagreek.java.enchald.main;
 
+
 import javafx.fxml.FXML;
 import javafx.scene.paint.Color;
 import org.technagreek.java.enchald.core.statusbar.StatusBarController;