diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000..f854ab0 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml new file mode 100644 index 0000000..cc01e3f --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml new file mode 100644 index 0000000..f198e4b --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml new file mode 100644 index 0000000..cde8a48 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml new file mode 100644 index 0000000..3391deb --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000..fbc1b16 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml new file mode 100644 index 0000000..20e8163 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml new file mode 100644 index 0000000..8bc862b --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bbd67ea..b8bdd9e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,17 @@ + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index ff8c83d..19b7cd7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 34a756a..ae11e2b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,19 +1,68 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -38,13 +94,25 @@ + + + + - + - + + + + + + + + + @@ -91,7 +161,30 @@ @@ -109,4 +202,10 @@ + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 396b357..40c43ee 100644 --- a/pom.xml +++ b/pom.xml @@ -39,9 +39,11 @@ UTF-8 + 11 13 13 5.7.0 + 15 @@ -68,10 +70,14 @@ 1.7.25 - org.junit.jupiter - junit-jupiter-api - 5.7.0 - compile + org.openjfx + javafx-controls + ${javafx.version} + + + org.openjfx + javafx-fxml + ${javafx.version} diff --git a/src/main/java/fr/myny/gui/Gui.java b/src/main/java/fr/myny/gui/Gui.java index 633d32b..b4a80c0 100644 --- a/src/main/java/fr/myny/gui/Gui.java +++ b/src/main/java/fr/myny/gui/Gui.java @@ -13,7 +13,7 @@ public class Gui extends Application { @Override public void start(Stage stage) throws IOException { - scene = new Scene(loadFXML("primary")); + scene = new Scene(loadFXML("scene1")); stage.setScene(scene); stage.show(); } diff --git a/src/main/java/fr/myny/gui/PrimaryController.java b/src/main/java/fr/myny/gui/PrimaryController.java deleted file mode 100644 index b3e3df4..0000000 --- a/src/main/java/fr/myny/gui/PrimaryController.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.myny.gui; - -import javafx.fxml.FXML; - -import java.io.IOException; - -public class PrimaryController { - - @FXML - private void switchToSecondary() throws IOException { - Gui.setRoot("secondary"); - } -} diff --git a/src/main/java/fr/myny/gui/SceneController.java b/src/main/java/fr/myny/gui/SceneController.java new file mode 100644 index 0000000..00435d1 --- /dev/null +++ b/src/main/java/fr/myny/gui/SceneController.java @@ -0,0 +1,56 @@ +package fr.myny.gui; + +import javafx.fxml.FXML; + +import java.io.IOException; + +/** + * Classe permettant le changement de scène ou de l'affichage de la popup + */ +public class SceneController { + + /** + * Permet l'affichage de la scène 1 + * @throws IOException + */ + @FXML + private void switchToScene1() throws IOException { + Gui.setRoot("scene1"); + } + + /** + * Permet l'affichage de la scène 2 + * @throws IOException + */ + @FXML + private void switchToScene2() throws IOException { + Gui.setRoot("scene2"); + } + + /** + * Permet l'affichage de la scène 3 + * @throws IOException + */ + @FXML + private void switchToScene3() throws IOException { + Gui.setRoot("scene3"); + } + + /** + * Permet l'affichage de la scène 4 + * @throws IOException + */ + @FXML + private void switchToScene4() throws IOException { + Gui.setRoot("scene4"); + } + + /** + * Permet l'affichage de la PopUp + * @throws IOException + */ + @FXML + private void showPopUp() throws IOException { + Gui.setRoot("popup1"); + } +} diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 8065c10..6e0bfc3 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,6 +1,7 @@ module fr.myny.gui { requires javafx.controls; requires javafx.fxml; + requires java.sql; opens fr.myny.gui to javafx.fxml; exports fr.myny.gui; diff --git a/src/main/resources/fr/myny/gui/popup.fxml b/src/main/resources/fr/myny/gui/popup.fxml index df35472..634f9eb 100644 --- a/src/main/resources/fr/myny/gui/popup.fxml +++ b/src/main/resources/fr/myny/gui/popup.fxml @@ -4,9 +4,9 @@ - +