diff --git a/FFM.iml b/FFM.iml index fb8e866..d998771 100644 --- a/FFM.iml +++ b/FFM.iml @@ -4,6 +4,7 @@ + diff --git a/out/production/FFM/sample/Controller.class b/out/production/FFM/sample/Controller.class deleted file mode 100644 index d9c917c..0000000 Binary files a/out/production/FFM/sample/Controller.class and /dev/null differ diff --git a/out/production/FFM/sample/Main.class b/out/production/FFM/sample/Main.class deleted file mode 100644 index 58c475e..0000000 Binary files a/out/production/FFM/sample/Main.class and /dev/null differ diff --git a/out/production/FFM/sample/sample.fxml b/out/production/FFM/sample/sample.fxml deleted file mode 100644 index 363237a..0000000 --- a/out/production/FFM/sample/sample.fxml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resource/welcomePage.fxml b/resource/welcomePage.fxml new file mode 100644 index 0000000..44ac3e0 --- /dev/null +++ b/resource/welcomePage.fxml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/src/sample/Main.java b/src/application/Main.java similarity index 59% rename from src/sample/Main.java rename to src/application/Main.java index 5603e43..3c673fb 100644 --- a/src/sample/Main.java +++ b/src/application/Main.java @@ -1,4 +1,4 @@ -package sample; +package application; import javafx.application.Application; import javafx.fxml.FXMLLoader; @@ -6,13 +6,19 @@ 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 { @Override public void start(Stage primaryStage) throws Exception{ - Parent root = FXMLLoader.load(getClass().getResource("sample.fxml")); + URL welcomePageUrl = ClassLoader.getSystemClassLoader(). + getResource("welcomePage.fxml"); + + Parent welcomePage = FXMLLoader.load(welcomePageUrl); primaryStage.setTitle("Friend Face Matcher"); - primaryStage.setScene(new Scene(root, 300, 275)); + primaryStage.setScene(new Scene(welcomePage)); primaryStage.show(); } diff --git a/src/resource/welcomePage.fxml b/src/resource/welcomePage.fxml new file mode 100644 index 0000000..44ac3e0 --- /dev/null +++ b/src/resource/welcomePage.fxml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/src/sample/Controller.java b/src/sample/Controller.java deleted file mode 100644 index 54e5bd1..0000000 --- a/src/sample/Controller.java +++ /dev/null @@ -1,4 +0,0 @@ -package sample; - -public class Controller { -} diff --git a/src/sample/sample.fxml b/src/sample/sample.fxml deleted file mode 100644 index 363237a..0000000 --- a/src/sample/sample.fxml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file