Move home button action listener to static block

powersagitar · Jan 10, 2025 · 90e3d7e · 90e3d7e
1 parent 9ba0492
commit 90e3d7e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/panels/HomeButton.java b/culminating-mastermind/app/src/main/java/mastermind/gui/panels/HomeButton.java
@@ -5,20 +5,17 @@
 import mastermind.gui.scenes.Scene;
 
 public class HomeButton {
-    private final static JButton homeButton;
-    private final static JPanel buttonPanel;
+    private final static JPanel buttonPanel = new JPanel();
 
     static {
-        homeButton = new JButton("Home");
-        buttonPanel = new JPanel();
-        buttonPanel.add(homeButton);
-    }
+        final JButton homeButton = new JButton("Home");
 
-    public static void registerHomeHandlers() {
         homeButton.addActionListener(event -> {
             final JFrame gameModeSelector = Scene.createDefaultScene();
             new GameModeSelector(gameModeSelector);
         });
+
+        buttonPanel.add(homeButton);
     }
 
     public static void drawHomeButton(final JFrame frame) {

diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java
@@ -58,8 +58,6 @@ public CodeBreaker(final JFrame frame, final MastermindAlgorithm algorithm) {
 
         homeButton.drawHomeButton(frame);
 
-        homeButton.registerHomeHandlers();
-
         registerGuessHandler();
 
         refreshFrame();

diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java
@@ -39,8 +39,6 @@ public CodeBreakerSelector(final JFrame frame) {
 
         homeButton.drawHomeButton(frame);
 
-        homeButton.registerHomeHandlers();
-
         registerProceedHandler();
 
         refreshFrame();

diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java
@@ -60,8 +60,6 @@ public CodeMaker(final JFrame frame) {
 
         registerDeleteHandlers();
 
-        homeButton.registerHomeHandlers();
-
         registerProceedHandlers();
 
         refreshFrame();