From 6dfc26f09cab6e0b805e64e22426895d1f32596e Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Wed, 8 Mar 2023 01:33:18 +0100
Subject: [PATCH] Copied over code from Emil from older commit
---
pom.xml | 5 +++--
src/main/java/no/ntnu/idatt1002/demo/MyApp.java | 3 +--
src/main/java/no/ntnu/idatt1002/demo/sceneController.java | 7 +++++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 454e08c1..3a865580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.8.1</junit.version>
- <javafx.version>17.0.1</javafx.version>
+ <javafx.version>17.0.6</javafx.version>
</properties>
<repositories>
@@ -172,7 +172,8 @@
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
- <mainClass>no.ntnu.idatt1002.demo/no.ntnu.idatt1002.demo.MyApp</mainClass>
+ <mainClass>no.ntnu.idatt1002.demo.MyApp</mainClass>
+ <executable>C:\Program Files\Java\jdk-17\bin\java.exe</executable>
<launcher>app</launcher>
<jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName>
diff --git a/src/main/java/no/ntnu/idatt1002/demo/MyApp.java b/src/main/java/no/ntnu/idatt1002/demo/MyApp.java
index bbd3a868..8450b33f 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/MyApp.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/MyApp.java
@@ -10,10 +10,9 @@ import java.util.Objects;
public class MyApp extends Application {
- @Override
+ @Override
public void start(Stage stage) {
try {
-
Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("FirstMenu.fxml")));
Scene scene = new Scene(root);
stage.setScene(scene);
diff --git a/src/main/java/no/ntnu/idatt1002/demo/sceneController.java b/src/main/java/no/ntnu/idatt1002/demo/sceneController.java
index 3254c327..fd0cf198 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/sceneController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/sceneController.java
@@ -2,6 +2,7 @@ package no.ntnu.idatt1002.demo;
import java.io.IOException;
+import java.util.Objects;
import javafx.event.ActionEvent;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
@@ -16,7 +17,8 @@ public class sceneController {
private Parent root;
public void switchStartMenu(ActionEvent event) throws IOException {
- root = FXMLLoader.load(getClass().getResource("view/StartMenu.fxml"));
+ root = FXMLLoader.load(
+ Objects.requireNonNull(getClass().getResource("view/StartMenu.fxml")));
stage = (Stage)((Node)event.getSource()).getScene().getWindow();
scene = new Scene(root);
stage.setScene(scene);
@@ -24,7 +26,8 @@ public class sceneController {
}
public void switchNewBudget(ActionEvent event) throws IOException {
- root = FXMLLoader.load(getClass().getResource("view/NewBudget.fxml"));
+ root = FXMLLoader.load(
+ Objects.requireNonNull(getClass().getResource("view/NewBudget.fxml")));
stage = (Stage)((Node)event.getSource()).getScene().getWindow();
scene = new Scene(root);
stage.setScene(scene);
--
GitLab