From f3cd4ac29d27b11fcb84104985cbb8c5c9a3758f Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 22 Nov 2019 22:14:44 +0100 Subject: [PATCH] add welcomePageController --- resource/welcomePage.fxml | 20 ------------------- src/application/Main.java | 3 +-- .../controller/WelcomePageController.java | 14 +++++++++++++ src/resource/welcomePage.fxml | 4 +++- 4 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 resource/welcomePage.fxml create mode 100644 src/application/controller/WelcomePageController.java diff --git a/resource/welcomePage.fxml b/resource/welcomePage.fxml deleted file mode 100644 index 44ac3e0..0000000 --- a/resource/welcomePage.fxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/application/Main.java b/src/application/Main.java index 3c673fb..a893d51 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -6,7 +6,6 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import java.io.File; import java.net.URL; public class Main extends Application { @@ -14,7 +13,7 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ URL welcomePageUrl = ClassLoader.getSystemClassLoader(). - getResource("welcomePage.fxml"); + getResource("resource/welcomePage.fxml"); Parent welcomePage = FXMLLoader.load(welcomePageUrl); primaryStage.setTitle("Friend Face Matcher"); diff --git a/src/application/controller/WelcomePageController.java b/src/application/controller/WelcomePageController.java new file mode 100644 index 0000000..71a4b8c --- /dev/null +++ b/src/application/controller/WelcomePageController.java @@ -0,0 +1,14 @@ +package application.controller; + +import javafx.fxml.FXML; + +public class WelcomePageController { + public WelcomePageController() { + System.out.println("Controller work"); + } + + @FXML + public void startNewApp(){ + System.out.println("Button work");; + } +} diff --git a/src/resource/welcomePage.fxml b/src/resource/welcomePage.fxml index 44ac3e0..5f72764 100644 --- a/src/resource/welcomePage.fxml +++ b/src/resource/welcomePage.fxml @@ -1,11 +1,12 @@ + - + @@ -14,6 +15,7 @@ +