modules open properly

kamil-sita · Mar 20, 2019 · 33b6439 · 33b6439
1 parent 7cd1fa0
commit 33b6439
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,6 +71,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
+                    <release>11</release>
                     <source>11</source>
                     <target>11</target>
                 </configuration>
@@ -109,10 +110,7 @@
                 <filtering>false</filtering>
                 <directory>src/main/java</directory>
                 <includes>
-                    <include>**/*.fxml</include>
-                    <include>**/*.html</include>
-                    <include>**/*.css</include>
-                    <include>**/*.MF</include>
+                    <include>**/*</include>
                 </includes>
             </resource>
         </resources>

diff --git a/src/main/java/XIS/Main.java b/src/main/java/XIS/Main.java
@@ -18,7 +18,8 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage stage) throws Exception{
-        var res = getClass().getResource("XIS/main/mainView.fxml");
+        var res = getClass().getResource("main/mainView.fxml");
+
         Parent root = FXMLLoader.load(res);
         stage.setTitle("XIS 0.3.1");
         stage.setScene(new Scene (root, 1280, 800));

diff --git a/src/main/java/XIS/sections/Vista.java b/src/main/java/XIS/sections/Vista.java
@@ -4,7 +4,6 @@
 import javafx.scene.layout.Pane;
 
 import java.io.IOException;
-import java.net.URL;
 
 /**
  * Abstract class of XIS.main vista in user interface.
@@ -35,10 +34,10 @@ protected void lazyLoad() {
     }
 
     protected void load(String location) {
-        URL url = Vista.class.getClassLoader().getResource(location);
+        var str = getClass().getResourceAsStream(location);
         try {
             FXMLLoader fxmlLoader = new FXMLLoader();
-            pane = fxmlLoader.load(url.openStream());
+            pane = fxmlLoader.load(str);
             xisController = fxmlLoader.getController();
         } catch (IOException e) {
             e.printStackTrace();

diff --git a/src/main/java/XIS/sections/automatedfilter/AutomatedFilter.java b/src/main/java/XIS/sections/automatedfilter/AutomatedFilter.java
@@ -5,7 +5,7 @@
 public final class AutomatedFilter extends Vista {
 
     public AutomatedFilter() {
-        this.defaultLocation = "XIS/sections/automatedfilter/automatedFilter.fxml";
+        this.defaultLocation = "/XIS/sections/automatedfilter/automatedFilter.fxml";
     }
 
 }
diff --git a/src/main/java/XIS/sections/compression/CompressionVista.java b/src/main/java/XIS/sections/compression/CompressionVista.java
@@ -5,7 +5,7 @@
 public final class CompressionVista extends Vista {
 
     public CompressionVista() {
-        this.defaultLocation = "XIS/sections/compression/compression.fxml";
+        this.defaultLocation = "/XIS/sections/compression/compression.fxml";
     }
 
 }
diff --git a/src/main/java/XIS/sections/defaultpage/WelcomePage.java b/src/main/java/XIS/sections/defaultpage/WelcomePage.java
@@ -5,6 +5,6 @@
 public final class WelcomePage extends Vista {
 
     public WelcomePage() {
-        this.defaultLocation = "XIS/sections/defaultpage/welcomePage.fxml";
+        this.defaultLocation = "/XIS/sections/defaultpage/welcomePage.fxml";
     }
 }
diff --git a/src/main/java/XIS/sections/highpassfilter/HighPassFilter.java b/src/main/java/XIS/sections/highpassfilter/HighPassFilter.java
@@ -5,7 +5,7 @@
 public final class HighPassFilter extends Vista {
 
     public HighPassFilter() {
-        this.defaultLocation = "XIS/sections/highpassfilter/highPassFilter.fxml";
+        this.defaultLocation = "/XIS/sections/highpassfilter/highPassFilter.fxml";
     }
 
 }
diff --git a/src/main/java/XIS/sections/imagecopyfinder/ImageCopyFinderVista.java b/src/main/java/XIS/sections/imagecopyfinder/ImageCopyFinderVista.java
@@ -6,8 +6,8 @@
 
 public final class ImageCopyFinderVista extends Vista {
 
-    private static final String LOCATION_VIEW1 = "XIS/sections/imagecopyfinder/view1settings/view1.fxml";
-    private static final String LOCATION_VIEW2 = "XIS/sections/imagecopyfinder/view2comparison/view2.fxml";
+    private static final String LOCATION_VIEW1 = "/XIS/sections/imagecopyfinder/view1settings/view1.fxml";
+    private static final String LOCATION_VIEW2 = "/XIS/sections/imagecopyfinder/view2comparison/view2.fxml";
     private static ImageComparator imageComparator;
     private static String deleteDirectory;
 

diff --git a/src/main/java/XIS/sections/scannertonote/ScannerToNote.java b/src/main/java/XIS/sections/scannertonote/ScannerToNote.java
@@ -5,7 +5,7 @@
 public final class ScannerToNote extends Vista {
 
     public ScannerToNote() {
-        this.defaultLocation = "XIS/sections/scannertonote/scannerToNote.fxml";
+        this.defaultLocation = "/XIS/sections/scannertonote/scannerToNote.fxml";
     }
 
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -10,5 +10,18 @@
     requires java.sql;
 
     requires simple.kmeans;
+
     exports XIS;
+
+    exports XIS.main;
+
+    opens XIS.sections.defaultpage to javafx.fxml;
+    opens XIS.sections.automatedfilter to javafx.fxml;
+    opens XIS.sections.compression to javafx.fxml;
+    opens XIS.sections.highpassfilter to javafx.fxml;
+    opens XIS.sections.imagecopyfinder to javafx.fxml;
+    opens XIS.sections.imagecopyfinder.view1settings to javafx.fxml;
+    opens XIS.sections.imagecopyfinder.view2comparison to javafx.fxml;
+    opens XIS.sections.scannertonote to javafx.fxml;
+    opens XIS.main to javafx.fxml;
 }