From 40e558be18c0856fff9d672835c35bb21eaac799 Mon Sep 17 00:00:00 2001 From: Mathis Ginkel Date: Thu, 23 Apr 2026 11:57:48 +0200 Subject: [PATCH] Feat: Add chat box into the game screen Refs #107 --- .../cs108/casono/client/ui/gameui/CasinoGameController.java | 3 ++- .../dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java index 56bab62..b5849f9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java @@ -143,6 +143,7 @@ public class CasinoGameController { private static final double CHAT_WIDTH = 400; private static final double CHAT_HEIGHT = 600; + private ChatController chatController; private String chatUsername; private ClientService chatClientService; private int chatLobbyId = -1; @@ -266,7 +267,7 @@ public class CasinoGameController { this.chatUsername = username; this.chatClientService = clientService; this.chatLobbyId = lobbyId; - //initializeChatIfPossible(); + //startChat(chatController); } /** 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 a392fcc..3f39656 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 @@ -59,9 +59,6 @@ public class CasinoGameUI extends Application { CasinoGameUI.username = username; } - public static void setChatController(ChatController chatController) { - CasinoGameUI.chatController = chatController; - } /** * Sets the lobby ID to be used by the application. @@ -124,8 +121,6 @@ public class CasinoGameUI extends Application { Parent root = fxmlLoader.load(); CasinoGameController controller = fxmlLoader.getController(); - controller.startChat(chatController); - if (lobbyId <= 0) { throw new IllegalStateException("CasinoGameUI: lobbyId must be set before start()"); }