From a629136fcb1cc83a847e9662ec2d433d57864c18 Mon Sep 17 00:00:00 2001 From: Jona Walpert Date: Wed, 22 Apr 2026 14:19:53 +0200 Subject: [PATCH] Chore: fix long line class paths on client side by using imports Refs #122 --- .../casono/client/ui/gameui/CasinoGameUI.java | 9 ++++----- .../ui/lobbyui/CasinomainuiController.java | 6 +++--- .../ui/lobbyui/LobbyButtonGridManager.java | 18 +++++++----------- .../ui/lobbyui/LobbyButtonGridManagerTest.java | 5 +++-- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java index 2970e70..d6908c1 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java @@ -1,5 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui; +import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp; import ch.unibas.dmi.dbis.cs108.casono.client.game.GameService; import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerId; import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService; @@ -77,8 +78,7 @@ public class CasinoGameUI extends Application { public void start(Stage stage) throws IOException { if (clientService == null) { - clientService = - ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedClientService(); + clientService = ClientApp.getSharedClientService(); } if (clientService == null) { throw new IllegalStateException( @@ -90,8 +90,7 @@ public class CasinoGameUI extends Application { String effectiveUsername = normalize(username); if (effectiveUsername == null) { - effectiveUsername = - normalize(ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername()); + effectiveUsername = normalize(ClientApp.getSharedUsername()); } if (effectiveUsername == null) { @@ -105,7 +104,7 @@ public class CasinoGameUI extends Application { + "', injectedUsername='" + username + "', sharedUsername='" - + ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername() + + ClientApp.getSharedUsername() + "', hasClientService=" + (clientService != null)); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java index db644f4..b3c2297 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java @@ -55,9 +55,9 @@ public class CasinomainuiController { } /** - * Initializes the UI components and sets default values. If a shared {@link - * ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService} exists (created at application - * start), the controller reuses it so the connection remains open and already-logged-in. + * Initializes the UI components and sets default values. If a shared {@link ClientService} + * exists (created at application start), the controller reuses it so the connection remains + * open and already-logged-in. */ @FXML public void initialize() { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java index 116686f..e3f1d01 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java @@ -1,7 +1,9 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui; +import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp; import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService; import ch.unibas.dmi.dbis.cs108.casono.client.network.LobbyClient; +import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; import java.util.ArrayList; import java.util.Collections; @@ -553,14 +555,10 @@ public class LobbyButtonGridManager { try { var cs = lobbyClient.getClientService(); - ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI - .setClientService(cs); - ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setLobbyId( - lobbyId); + CasinoGameUI.setClientService(cs); + CasinoGameUI.setLobbyId(lobbyId); - String username = - ch.unibas.dmi.dbis.cs108.casono.client.ClientApp - .getSharedUsername(); + String username = ClientApp.getSharedUsername(); if (username == null || username.isBlank()) { username = "Guest-" @@ -570,11 +568,9 @@ public class LobbyButtonGridManager { .toString() .substring(0, GUEST_ID_LENGTH); } - ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setUsername( - username); + CasinoGameUI.setUsername(username); - new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI() - .start(gameStage); + new CasinoGameUI().start(gameStage); } catch (Exception e) { LOGGER.error("Game UI failed: {}", e.getMessage()); diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java index 9958957..06be776 100644 --- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java +++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java @@ -1,6 +1,7 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui; import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService; +import ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer; import javafx.scene.layout.GridPane; import org.junit.jupiter.api.*; @@ -8,7 +9,7 @@ class LobbyButtonGridManagerTest { LobbyButtonGridManager gridManager; LobbyButtonTranslationManager translationManager; GridPane gridPane; - ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer testServer; + TestServer testServer; @BeforeEach void setUp() throws Exception { @@ -16,7 +17,7 @@ class LobbyButtonGridManagerTest { translationManager = LobbyButtonTranslationManager.getInstance(); translationManager.getButtonIdToLobbyId().clear(); // Start an in-process test server and connect a real ClientService to it. - testServer = new ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer(); + testServer = new TestServer(); String host = "127.0.0.1"; int port = testServer.getPort(); ClientService clientService = new ClientService(host, port);