diff --git a/enchald.iml b/enchald.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/enchald.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 72c4d20..d36967a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,10 +9,21 @@
1.0.0.0
UTF-8
- 1.8
- 1.8
+ 15
+ 15
-
+
+
+ org.openjfx
+ javafx-controls
+ 15.0.1
+
+
+ org.openjfx
+ javafx-fxml
+ 15.0.1
+
+
@@ -20,8 +31,16 @@
maven-compiler-plugin
3.7.0
-
- 1.8
+
+ 15
+
+
+
+ org.openjfx
+ javafx-maven-plugin
+ 0.0.5
+
+ org.technagreek.java.enchald.main.AppLauncher
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
index 7b865b9..d275884 100644
--- 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
index dd6960b..f763d4a 100644
--- 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
index 7943b62..76730f5 100644
--- 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;