From 90e3d7e8ca21633a7367a19151b4e16574090b2d Mon Sep 17 00:00:00 2001 From: powersagitar <114868133+powersagitar@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:25:13 -0500 Subject: [PATCH] Move home button action listener to static block --- .../main/java/mastermind/gui/panels/HomeButton.java | 11 ++++------- .../main/java/mastermind/gui/scenes/CodeBreaker.java | 2 -- .../mastermind/gui/scenes/CodeBreakerSelector.java | 2 -- .../main/java/mastermind/gui/scenes/CodeMaker.java | 2 -- 4 files changed, 4 insertions(+), 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 index 8e7a59d..a83249d 100644 --- 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 index 866d6e9..576c8fb 100644 --- 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 index ac5705b..bf5cb34 100644 --- 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 index 28ac0e8..f51a94e 100644 --- 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();