From 78f14ffcb41ab1270403be8f0c719897f7a8f990 Mon Sep 17 00:00:00 2001 From: CyB3RC0nN0R Date: Fri, 10 Apr 2020 21:26:24 +0200 Subject: [PATCH] Moved all FXML files to the resource folder --- src/main/java/envoy/client/ui/LoginDialog.java | 2 +- src/main/java/envoy/client/ui/Startup.java | 2 +- .../{java/envoy/client/ui => resources/fxml}/ChatScene.fxml | 0 .../{java/envoy/client/ui => resources/fxml}/LoginDialog.fxml | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/main/{java/envoy/client/ui => resources/fxml}/ChatScene.fxml (100%) rename src/main/{java/envoy/client/ui => resources/fxml}/LoginDialog.fxml (100%) diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java index 679e9ee..8fbd78d 100644 --- a/src/main/java/envoy/client/ui/LoginDialog.java +++ b/src/main/java/envoy/client/ui/LoginDialog.java @@ -72,7 +72,7 @@ public final class LoginDialog extends Dialog { this.localDB = localDB; this.receivedMessageCache = receivedMessageCache; - final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml")); + final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml")); loader.setController(this); final var dialogPane = loader.load(); diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java index 118fea6..becc467 100644 --- a/src/main/java/envoy/client/ui/Startup.java +++ b/src/main/java/envoy/client/ui/Startup.java @@ -124,7 +124,7 @@ public final class Startup extends Application { .forEach(u -> u.setStatus(UserStatus.OFFLINE)); // Prepare stage and load ChatScene - var loader = new FXMLLoader(getClass().getResource("ChatScene.fxml")); + var loader = new FXMLLoader(getClass().getResource("/fxml/ChatScene.fxml")); var anchorPane = loader.load(); var chatScene = new Scene(anchorPane); stage.setTitle("Envoy"); diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml similarity index 100% rename from src/main/java/envoy/client/ui/ChatScene.fxml rename to src/main/resources/fxml/ChatScene.fxml diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml similarity index 100% rename from src/main/java/envoy/client/ui/LoginDialog.fxml rename to src/main/resources/fxml/LoginDialog.fxml