diff --git a/TestV2/src/fr/monkhanny/dorfromantik/Main.java b/TestV2/src/fr/monkhanny/dorfromantik/Main.java index b5834bc..6980157 100644 --- a/TestV2/src/fr/monkhanny/dorfromantik/Main.java +++ b/TestV2/src/fr/monkhanny/dorfromantik/Main.java @@ -5,7 +5,7 @@ import fr.monkhanny.dorfromantik.controller.MainMenuResizeController; import fr.monkhanny.dorfromantik.controller.MainMenuButtonController; import fr.monkhanny.dorfromantik.utils.MusicPlayer; import fr.monkhanny.dorfromantik.enums.Musics; -import fr.monkhanny.dorfromantik.listeners.SettingsWindowListener; +import fr.monkhanny.dorfromantik.listeners.CloseWindowListener; import fr.monkhanny.dorfromantik.gui.SettingsPanel; import fr.monkhanny.dorfromantik.controller.TutorialController; @@ -43,14 +43,15 @@ public class Main { // Fenêtre des paramètres - SettingsWindowListener windowListener = new SettingsWindowListener(mainMenu, settingsFrame); + CloseWindowListener settingsWindowListener = new CloseWindowListener(mainMenu, settingsFrame); SettingsPanel settingsPanel = new SettingsPanel(mainMenu, settingsFrame); - settingsFrame.addWindowListener(windowListener); + settingsFrame.addWindowListener(settingsWindowListener); settingsFrame.add(settingsPanel); // Fenêtre du tutoriel + CloseWindowListener howToPlayWindowListener = new CloseWindowListener(mainMenu, howToPlayFrame); TutorialController tutorialController = new TutorialController(); - howToPlayFrame.addWindowListener(windowListener); + howToPlayFrame.addWindowListener(howToPlayWindowListener); howToPlayFrame.add(tutorialController.getTutorialPanel()); // Fenêtre du jeu diff --git a/TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuButtonController.java b/TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuButtonController.java index 18bf8b0..da827ab 100644 --- a/TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuButtonController.java +++ b/TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuButtonController.java @@ -4,7 +4,7 @@ import fr.monkhanny.dorfromantik.Options; import fr.monkhanny.dorfromantik.gui.SettingsPanel; import fr.monkhanny.dorfromantik.gui.MainMenu; import fr.monkhanny.dorfromantik.gui.ButtonPanel; -import fr.monkhanny.dorfromantik.listeners.SettingsWindowListener; +import fr.monkhanny.dorfromantik.listeners.CloseWindowListener; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/TestV2/src/fr/monkhanny/dorfromantik/listeners/SettingsWindowListener.java b/TestV2/src/fr/monkhanny/dorfromantik/listeners/CloseWindowListener.java similarity index 58% rename from TestV2/src/fr/monkhanny/dorfromantik/listeners/SettingsWindowListener.java rename to TestV2/src/fr/monkhanny/dorfromantik/listeners/CloseWindowListener.java index 93f1c46..0babcc5 100644 --- a/TestV2/src/fr/monkhanny/dorfromantik/listeners/SettingsWindowListener.java +++ b/TestV2/src/fr/monkhanny/dorfromantik/listeners/CloseWindowListener.java @@ -6,20 +6,20 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.*; -public class SettingsWindowListener extends WindowAdapter { +public class CloseWindowListener extends WindowAdapter { private MainMenu mainMenu; - private JFrame settingsFrame; + private JFrame frame; - public SettingsWindowListener(MainMenu mainMenu, JFrame settingsFrame) { + public CloseWindowListener(MainMenu mainMenu, JFrame frame) { this.mainMenu = mainMenu; - this.settingsFrame = settingsFrame; + this.frame = frame; } @Override public void windowClosing(WindowEvent e) { // Réafficher la fenêtre du menu principal mainMenu.setVisible(true); - settingsFrame.setVisible(false); // Fermer la fenêtre des paramètres + frame.setVisible(false); } }