Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00

69 Commits

Author SHA1 Message Date
Mathis Ginkel 9e7a80c17d Docs: add description of enum ChatType
Refs #88
2026-04-11 15:07:55 +02:00
Mathis Ginkel 9df3042978 Style: fix line breaks in UsernameAvailability
Refs #88
2026-04-11 14:57:23 +02:00
Mathis Ginkel 69333ede7a Fix: change visibility of enum UsernameAvailability
Refs #88
2026-04-11 14:48:46 +02:00
Julian Kropff cdb6d0c6b0 Fix: revert wrongfully deleted line breaks
Refs #88
2026-04-11 14:43:48 +02:00
Mathis Ginkel a65341b648 Style: Manually revert changes made to SuccessResponse 2026-04-11 14:37:13 +02:00
Julian Kropff b4b2e3b067 Fix: Resolving Git Merge Conflicts and Checkstyle
Refs #88
2026-04-11 14:01:21 +02:00
Julian Kropff beeba04a2c Merge branch 'feat/client-chat' into chore/ui-checkstyle-fixes
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
#	src/main/resources/ui-structure/components/Chatbox.fxml
2026-04-11 12:56:01 +02:00
Julian Kropff edb98c8d21 Merge branch 'feat/client-communication' into chore/ui-checkstyle-fixes
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java
2026-04-11 12:20:27 +02:00
Mathis Ginkel 590a9aa658 Style: Manually revert changes made to UsernameAvailability enum 2026-04-11 11:56:06 +02:00
Mathis Ginkel 66d3826509 Docs: Delete outdated network protocol document 2026-04-11 11:16:21 +02:00
Mathis Ginkel 9c09927d09 Docs: Adding Server Commands for Client Chat to the protocol document manually reverting changes 2026-04-10 23:25:05 +02:00
Mathis Ginkel 97e5a55042 Style: Apply Spotless 2026-04-10 22:43:23 +02:00
Mathis Ginkel 31d3947175 Add: CSS-Style changes to the ChatBox 2026-04-10 13:21:34 +02:00
Mathis Ginkel 1914aa2c7f Merge branch 'main' into 'feat/client-chat'
# Conflicts:
#   src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
2026-04-09 19:34:38 +00:00
Mathis Ginkel 13df8db33e Docs: Insert JavaDocs 2026-04-09 21:25:46 +02:00
Mathis Ginkel 566c9375ab Style: Apply Spotless 2026-04-09 20:36:18 +02:00
Mathis Ginkel 84e68d8b20 Merge remote-tracking branch 'origin/feat/client-chat' into feat/client-chat
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
#	src/main/resources/ui-structure/Casinogameui.fxml
#	src/main/resources/ui-structure/components/chatui/chatbox.fxml
#	src/main/resources/ui-structure/components/chatui/chattab.fxml
#	src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
#	src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
#	src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
2026-04-09 18:13:29 +02:00
Mathis Ginkel e8401a976a Add: First implementation of Button, to create Whisper Chat 2026-04-09 18:04:57 +02:00
Mathis Ginkel c0c9225d42 Fix: Parsing of Server Responses for Client Chat 2026-04-09 18:04:57 +02:00
Mathis Ginkel 4e7b0ab67a Add: Implement Commands for Chat Protocol 2026-04-09 18:04:57 +02:00
Mathis Ginkel 39f60c9113 Fix: small changes to ChatUI 2026-04-09 18:04:57 +02:00
Jona Walpert 847d816935 Add: first (non functioning) modified version of lobby button controlelr with abckend conenction 2026-04-09 18:04:57 +02:00
Julian Kropff c8a9393fb6 Add: documentation for client network architecture 2026-04-09 18:04:57 +02:00
Julian Kropff 79bd33ad75 Add: initial client structure for game and network 2026-04-09 18:04:57 +02:00
Mathis Ginkel f5138503cb Add: CoreClient and ChatClient 2026-04-09 18:04:57 +02:00
Julian Kropff 93e39c3962 Add: Client Network Architecture Documentation 2026-04-09 18:04:57 +02:00
Mathis Ginkel 7d19e65428 Add: client chat architecture for lobby and global chat 2026-04-09 18:04:50 +02:00
Mathis Ginkel 87e9305e82 Fix: small changes in ClientService 2026-04-09 18:03:26 +02:00
Mathis Ginkel de66757837 Resolve Conflicts 2026-04-09 18:03:26 +02:00
Mathis Ginkel 65304cbb66 Merge remote-tracking branch 'origin/main' 2026-04-09 18:02:35 +02:00
Jona Walpert b205b25b48 Feat: Adds functionality to periodically refresh lobbies to update lobby GUI screen 2026-04-09 10:43:25 +02:00
Jona Walpert df31c307fe Fix: Comment out faulty Unit Test 2026-04-09 10:42:45 +02:00
Jona Walpert f3ecbd12f5 Feat: Add username text field to main Lobby 2026-04-08 13:34:26 +02:00
Jona Walpert 5d4d2655ef Add: Supply gameUI with client service at game startup 2026-04-08 13:33:31 +02:00
Jona Walpert d855f2d568 Feat: add offline mode to prevent errors when trying to send requests to not connected server 2026-04-08 13:29:39 +02:00
Jona Walpert ca782b389e Docs: Translate Javadoc and comments to English 2026-04-08 13:26:36 +02:00
Jona Walpert 04bf7ba545 Refactor: move login function from coreClient to LobbyClient 2026-04-08 13:22:24 +02:00
Mathis Ginkel 509aa71d9f Add: Implement Commands for Chat Protocol 2026-04-07 22:15:23 +02:00
Mathis Ginkel d1d2fb30e8 Fix: small changes to ChatUI 2026-04-07 22:11:20 +02:00
Jona Walpert aca61cbd52 Add: first (non functioning) modified version of lobby button controlelr with abckend conenction 2026-04-07 22:11:20 +02:00
Julian Kropff 73756b7d24 Add: documentation for client network architecture 2026-04-07 22:11:20 +02:00
Julian Kropff 60ed1ced91 Add: initial client structure for game and network 2026-04-07 22:11:20 +02:00
Mathis Ginkel eda51f8ac5 Add: CoreClient and ChatClient 2026-04-07 22:11:20 +02:00
Julian Kropff ce71992e17 Add: Client Network Architecture Documentation 2026-04-07 22:11:20 +02:00
Mathis Ginkel a9dcd79b38 Add: client chat architecture for lobby and global chat 2026-04-07 22:11:20 +02:00
Mathis Ginkel 79831b046c Fix: small changes in ClientService 2026-04-07 22:11:20 +02:00
Mathis Ginkel 61e54f282e Resolve Conflicts 2026-04-07 22:11:20 +02:00
Mathis Ginkel 8fb2657cdd Merge remote-tracking branch 'origin/main' 2026-04-07 22:10:52 +02:00
Mathis Ginkel 55a6d4beed Merge remote-tracking branch 'origin/main' 2026-04-05 13:12:39 +02:00
Jona Walpert 42b5344059 Test: Add in-process TestServer and update LobbyButtonGridManagerTest
Add TestServer that speaks the RawPacket/TcpTransport protocol for CREATE_LOBBY,
GET_LOBBY_STATUS and JOIN_LOBBY. Update LobbyButtonGridManagerTest to start the
TestServer and exercise a real `ClientService(host, port)`, enabling integration-style
tests of the client->transport->server roundtrip without an external server.

Refs #36
2026-04-02 22:28:12 +02:00
Jona Walpert 76e62b3cff Feat: Accept ClientService and delegate to LobbyClient
Add constructor overload that accepts ClientService and constructs a LobbyClient.
Avoids implicit host/port lookup in UI code; caller controls network config.
Keeps rendering/status behavior unchanged (async updates, deterministic ordering).
2026-04-02 22:26:14 +02:00
Jona Walpert 1070b5d4b9 Chore(startup): Propagate server ip:port to UI via system properties
ClientApp.start parses <ip>:<port>, sets `casono.server.host` / `casono.server.port` and forwards the original launch arg to the JavaFX launcher.
Casinomainui reads JavaFX launch args and exposes the same system properties.
CasinomainuiController reads those properties and constructs `ClientService(host, port)` (no hardcoded defaults)."
2026-04-02 22:12:48 +02:00
Jona Walpert 4daf6ff4a2 Fix: Sort button IDs before iterating map for deterministic rendering
Copy mapping.keySet() to a List and call Collections.sort(...) before iterating.
Ensures stable button placement and reproducible image updates (render + update)
2026-04-02 22:00:18 +02:00
Mathis Ginkel 7b1b35698c Merge remote-tracking branch 'origin/main' 2026-04-02 22:00:06 +02:00
Jona Walpert 3153f7027d fix: temporyy fix for NPE and wrong naming 2026-04-02 18:50:20 +02:00
Jona Walpert b5d19d915b Add: first (non functioning) modified version of lobby button controlelr with abckend conenction 2026-04-02 16:31:27 +02:00
Julian Kropff 09c19c2602 Add: documentation for client network architecture 2026-04-02 16:10:33 +02:00
Julian Kropff 77c7f7c0a5 Add: initial client structure for game and network 2026-04-02 16:08:24 +02:00
Mathis Ginkel 6f80501ea2 Add: CoreClient and ChatClient 2026-04-02 11:16:40 +02:00
Julian Kropff 45cd54b981 Add: Client Network Architecture Documentation 2026-04-02 10:54:47 +02:00
Mathis Ginkel 3427c661cf Merge branch 'feat/client-chat' into feat/client-communication
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java
2026-04-02 10:31:28 +02:00
Mathis Ginkel ff07843e0a Fix: small changes in ClientService 2026-04-02 10:22:51 +02:00
Mathis Ginkel cc33411911 Add: basic chat functionality 2026-04-02 10:20:03 +02:00
Mathis Ginkel f721a26e53 Merge remote-tracking branch 'origin/main' 2026-04-02 10:14:23 +02:00
Mathis Ginkel dd721bda3f Merge remote-tracking branch 'origin/main' 2026-03-28 12:45:53 +01:00
Mathis Ginkel 68c7003c5d Merge remote-tracking branch 'origin/main' 2026-03-23 21:06:41 +01:00
Mathis Ginkel b4f34e00f2 Merge remote-tracking branch 'origin/main' 2026-03-21 10:01:34 +01:00
Mathis Ginkel 26a1ba945a Merge remote-tracking branch 'origin/main' 2026-03-20 13:23:01 +01:00
Mathis Ginkel 5401ead198 add: Network Protocol docs 2026-03-15 22:31:10 +01:00