From 7cef3c79761d516e398ebfd5e94681e055d9731c Mon Sep 17 00:00:00 2001
From: karin_pettersen <karinep@stud.ntnu.no>
Date: Tue, 22 Feb 2022 14:38:39 +0100
Subject: [PATCH] Adding input.fxml
---
Bachelor_application.iml | 1 +
src/main/java/com/application/Main.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Bachelor_application.iml b/Bachelor_application.iml
index bc7457f..25adb4d 100644
--- a/Bachelor_application.iml
+++ b/Bachelor_application.iml
@@ -5,6 +5,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index b0e9ece..320bbce 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -28,7 +28,8 @@ public class Main extends Application {
// Loading the GUI-fxml file from resources
Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/GUI/graphical_user_interface.fxml")));
-
+ // Loading the GUI-fxml file from resources
+ root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/GUI/input.fxml")));
// Sets the scene and defines boundaries
Scene scene = new Scene(root, 1200, 600);
--
GitLab