From c0f42fb1ebc1fc53f61c9c2ca2ce43b50d967b4a Mon Sep 17 00:00:00 2001 From: Johannes Schmelz Date: Sun, 24 Nov 2024 22:50:52 +0100 Subject: [PATCH] refactor --- .../client/{ => gui/popups}/LoserPopUp.java | 30 ++++++------------- .../client/{ => gui/popups}/WinnerPopUp.java | 25 ++++++++-------- 2 files changed, 22 insertions(+), 33 deletions(-) rename Projekte/monopoly/client/src/main/java/pp/monopoly/client/{ => gui/popups}/LoserPopUp.java (76%) rename Projekte/monopoly/client/src/main/java/pp/monopoly/client/{ => gui/popups}/WinnerPopUp.java (68%) diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/LoserPopUp.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/LoserPopUp.java similarity index 76% rename from Projekte/monopoly/client/src/main/java/pp/monopoly/client/LoserPopUp.java rename to Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/LoserPopUp.java index 6a73724..11145d7 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/LoserPopUp.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/LoserPopUp.java @@ -1,4 +1,4 @@ -package pp.monopoly.client; +package pp.monopoly.client.gui.popups; import com.jme3.asset.TextureKey; import com.jme3.math.Vector2f; @@ -8,25 +8,20 @@ import com.simsilica.lemur.Container; import com.simsilica.lemur.Label; import com.simsilica.lemur.component.IconComponent; import pp.dialog.SimpleDialog; +import pp.monopoly.client.MonopolyApp; public class LoserPopUp extends SimpleDialog { - - - - - private final NetworkSupport network; - + private final MonopolyApp app; /** * Constructs a new NetworkDialog. * - * * @param network The NetworkSupport instance to be used for network operations. */ - public LoserPopUp( NetworkSupport network) { - super(network.getApp().getDialogManager()); - this.network = network; + public LoserPopUp(MonopolyApp app) { + super(app.getDialogManager()); + this.app = app; initializeDialog(); } @@ -34,7 +29,6 @@ public class LoserPopUp extends SimpleDialog { * Initializes the dialog with input fields and connection buttons. */ private void initializeDialog() { - final MonopolyApp hallo = network.getApp(); Container inputContainer = new Container(); // Titel und Eingabefelder für Host und Port @@ -43,24 +37,18 @@ public class LoserPopUp extends SimpleDialog { Label imageLabel = new Label(""); TextureKey key = new TextureKey("Pictures/MonopolyLoser.png", true); - Texture texture = hallo.getAssetManager().loadTexture(key); + Texture texture = app.getAssetManager().loadTexture(key); IconComponent icon = new IconComponent(texture.toString()); // Icon mit Textur erstellen icon.setIconSize(new Vector2f(155f, 120f)); // Skalierung des Bildes imageLabel.setIcon(icon); // Setze das Icon im Label - inputContainer.addChild(imageLabel); - - Button cancelButton = inputContainer.addChild(new Button("Spiel beenden")); - cancelButton.addClickCommands(source -> hallo.closeApp()); + cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp)); inputContainer.setLocalTranslation(300,500,0); - hallo.getGuiNode().attachChild(inputContainer); + attachChild(inputContainer); } - - - } diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/WinnerPopUp.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java similarity index 68% rename from Projekte/monopoly/client/src/main/java/pp/monopoly/client/WinnerPopUp.java rename to Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java index e177234..fb6f065 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/WinnerPopUp.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java @@ -1,4 +1,4 @@ -package pp.monopoly.client; +package pp.monopoly.client.gui.popups; import com.jme3.asset.TextureKey; import com.jme3.math.Vector2f; @@ -7,20 +7,22 @@ import com.simsilica.lemur.Button; import com.simsilica.lemur.Container; import com.simsilica.lemur.Label; import com.simsilica.lemur.component.IconComponent; -import pp.dialog.SimpleDialog; -public class WinnerPopUp extends SimpleDialog { +import pp.dialog.Dialog; +import pp.monopoly.client.MonopolyApp; - private final NetworkSupport network; +public class WinnerPopUp extends Dialog { + + private final MonopolyApp app; /** * Constructs a new NetworkDialog. * - * @param network The NetworkSupport instance to be used for network operations. + * @param app The NetworkSupport instance to be used for network operations. */ - public WinnerPopUp(NetworkSupport network) { - super(network.getApp().getDialogManager()); - this.network = network; + public WinnerPopUp(MonopolyApp app) { + super(app.getDialogManager()); + this.app = app; initializeDialog(); } @@ -28,7 +30,6 @@ public class WinnerPopUp extends SimpleDialog { * Initializes the dialog with input fields and connection buttons. */ private void initializeDialog() { - final MonopolyApp appp = network.getApp(); Container inputContainer = new Container(); // Titel und Eingabefelder für Host und Port @@ -37,7 +38,7 @@ public class WinnerPopUp extends SimpleDialog { Label imageLabel = new Label(""); TextureKey key = new TextureKey("Pictures/MonopolyWinner.png", true); - Texture texture = appp.getAssetManager().loadTexture(key); + Texture texture = app.getAssetManager().loadTexture(key); IconComponent icon = new IconComponent(texture.toString()); // Icon mit Textur erstellen icon.setIconSize(new Vector2f(150f, 100f)); // Skalierung des Bildes imageLabel.setIcon(icon); @@ -47,9 +48,9 @@ public class WinnerPopUp extends SimpleDialog { inputContainer.addChild(imageLabel); Button cancelButton = inputContainer.addChild(new Button("Spiel beenden")); - cancelButton.addClickCommands(source -> appp.closeApp()); + cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp)); inputContainer.setLocalTranslation(300, 500, 0); - appp.getGuiNode().attachChild(inputContainer); + attachChild(inputContainer); } }