Edit file path for fxmlLoader

fredtwt · Feb 14, 2022 · ec8bcdd · ec8bcdd
1 parent 8130e3c
commit ec8bcdd
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/doge/Main.java b/src/main/java/doge/Main.java
@@ -1,6 +1,5 @@
 package doge;
 
-import java.io.File;
 import java.io.IOException;
 
 import doge.command.ByeCommand;
@@ -19,7 +18,7 @@ public class Main extends Application {
     public void start(Stage stage) {
         try {
             FXMLLoader fxmlLoader =
-                    new FXMLLoader(new File("./src/main/resource/view/MainWindow.fxml").toURI().toURL());
+                    new FXMLLoader(MainWindow.class.getResource("/view/MainWindow.fxml"));
             AnchorPane ap = fxmlLoader.load();
             stage.setScene(new Scene(ap));
             stage.setTitle("Doge");

diff --git a/src/main/java/doge/view/DialogBox.java b/src/main/java/doge/view/DialogBox.java
@@ -1,6 +1,5 @@
 package doge.view;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 
@@ -27,7 +26,8 @@ public class DialogBox extends HBox {
 
     private DialogBox(String text, Image img) {
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(new File("./src/main/resource/view/DialogBox.fxml").toURI().toURL());
+            FXMLLoader fxmlLoader =
+                    new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
             fxmlLoader.setController(this);
             fxmlLoader.setRoot(this);
             fxmlLoader.load();

diff --git a/src/main/java/doge/view/DogeDialogBox.java b/src/main/java/doge/view/DogeDialogBox.java
@@ -1,6 +1,5 @@
 package doge.view;
 
-import java.io.File;
 import java.io.IOException;
 
 import javafx.fxml.FXML;
@@ -23,7 +22,7 @@ public class DogeDialogBox extends HBox {
     private DogeDialogBox(String text, Image img) {
         try {
             FXMLLoader fxmlLoader =
-                    new FXMLLoader(new File("./src/main/resource/view/DogeDialogBox.fxml").toURI().toURL());
+                    new FXMLLoader(MainWindow.class.getResource("/view/DogeDialogBox.fxml"));
             fxmlLoader.setController(this);
             fxmlLoader.setRoot(this);
             fxmlLoader.load();

diff --git a/src/main/java/doge/view/MainWindow.java b/src/main/java/doge/view/MainWindow.java
@@ -1,7 +1,5 @@
 package doge.view;
 
-import java.io.File;
-
 import doge.Doge;
 import doge.Parser;
 import doge.command.ByeCommand;
@@ -30,8 +28,8 @@ public class MainWindow extends AnchorPane {
     private Button sendButton;
 
     private Doge doge;
-    private Image userImg = new Image(new File("./src/main/resource/images/user.png").toURI().toString());
-    private Image dogeImg = new Image(new File("./src/main/resource/images/doge.jpg").toURI().toString());
+    private Image userImg = new Image(this.getClass().getResourceAsStream("/images/user.png"));
+    private Image dogeImg = new Image(this.getClass().getResourceAsStream("/images/doge.jpg"));
 
     @FXML
     public void initialize() {

diff --git a/src/main/resource/images/doge.jpg → src/main/resources/images/doge.jpg b/src/main/resource/images/doge.jpg → src/main/resources/images/doge.jpg
diff --git a/src/main/resource/images/user.png → src/main/resources/images/user.png b/src/main/resource/images/user.png → src/main/resources/images/user.png
diff --git a/src/main/resource/view/DialogBox.fxml → src/main/resources/view/DialogBox.fxml b/src/main/resource/view/DialogBox.fxml → src/main/resources/view/DialogBox.fxml
diff --git a/src/main/resource/view/DogeDialogBox.fxml → src/main/resources/view/DogeDialogBox.fxml b/src/main/resource/view/DogeDialogBox.fxml → src/main/resources/view/DogeDialogBox.fxml
diff --git a/src/main/resource/view/MainWindow.fxml → src/main/resources/view/MainWindow.fxml b/src/main/resource/view/MainWindow.fxml → src/main/resources/view/MainWindow.fxml