From cd7627d36d943b247c2ba674df24072b6ded6921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Fri, 28 May 2021 01:15:50 +0200
Subject: [PATCH] Launcher now finds and correctly sets main Scene

---
 pom.xml                               |  5 +++++
 src/launcher/Launcher.java            | 15 ++++++++-------
 {ui => src/launcher/ui}/launcher.fxml |  0
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {ui => src/launcher/ui}/launcher.fxml (100%)

diff --git a/pom.xml b/pom.xml
index ae435b3..ed7c37e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,11 @@
   <description>Projet de fin d'année de L3</description>
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+    	<resource>
+    		<directory>src/launcher/ui</directory>
+		</resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java
index 5710657..cb88124 100644
--- a/src/launcher/Launcher.java
+++ b/src/launcher/Launcher.java
@@ -9,8 +9,6 @@
 
 package launcher;
 
-import java.io.FileInputStream;
-
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -19,16 +17,19 @@ import javafx.fxml.*;
 
 public class Launcher extends Application {
 
+	/*
+	 * Start method is used by Launcher as an implementation of the Application class to create a JavaFX thread to display the GUI window
+	 */
 	public void start(Stage primaryStage) throws Exception {
-		FileInputStream r_launcher = new FileInputStream("ui/launcher.fxml");
-		FXMLLoader floader = new FXMLLoader();
-		Parent root = floader.load(r_launcher);
-		Scene main = root.getScene();
+		
+		Parent root = FXMLLoader.load(getClass().getResource("ui/launcher.fxml"));
+		
+		Scene main = new Scene(root);
 		
 		primaryStage.setTitle("Boulevard Combattant");
-		
 		primaryStage.setScene(main);
 		primaryStage.show();
+		
 	}
 	
 }
diff --git a/ui/launcher.fxml b/src/launcher/ui/launcher.fxml
similarity index 100%
rename from ui/launcher.fxml
rename to src/launcher/ui/launcher.fxml