University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Feat/lobby join logging #275

Merged
jona.walpert merged 5 commits from feat/lobby-join-logging into main 2026-04-12 13:33:42 +02:00
Conversation 1 Commits 5 Files Changed 5
+51 -78
2 changed files with 51 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4fa60ad9e0 - Show all commits
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java
+49 -76
View File
@@ -5,7 +5,7 @@ import ch.unibas.dmi.dbis.cs108.casono.client.game.GameState;
import ch.unibas.dmi.dbis.cs108.casono.client.game.Player; import ch.unibas.dmi.dbis.cs108.casono.client.game.Player;
import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerId; import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerId;
import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerState; import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerState;
// Casinomainui is loaded via FXMLLoader when switching back to the lobby UI import ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.Casinomainui;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
@@ -20,29 +20,20 @@ import org.apache.logging.log4j.Logger;
/** /**
* Controller for the interactive taskbar within the poker UI. * Controller for the interactive taskbar within the poker UI.
* *
* <p> * <p>Responsible for: - Drag-and-drop movement of the taskbar, - Input and management of game
* Responsible for: - Drag-and-drop movement of the taskbar, - Input and
* management of game
* stakes, - Control of general menu functions such as Exit. * stakes, - Control of general menu functions such as Exit.
*/ */
public class TaskbarController { public class TaskbarController {
private static final Logger LOGGER = LogManager.getLogger(CasinoBrowserController.class); private static final Logger LOGGER = LogManager.getLogger(CasinoBrowserController.class);
@FXML @FXML private HBox taskbar;
private HBox taskbar; @FXML private TextField taskbarInput;
@FXML @FXML private Button betButton;
private TextField taskbarInput; @FXML private Button callButton;
@FXML @FXML private Button foldButton;
private Button betButton; @FXML private Button raiseButton;
@FXML @FXML private Label moneyLabel;
private Button callButton;
@FXML
private Button foldButton;
@FXML
private Button raiseButton;
@FXML
private Label moneyLabel;
private GameService gameService; private GameService gameService;
private PlayerId myPlayerId; private PlayerId myPlayerId;
@@ -66,12 +57,10 @@ public class TaskbarController {
} }
/** /**
* Updates the state of the basic action buttons (Bet, Call, Fold, Raise) and * Updates the state of the basic action buttons (Bet, Call, Fold, Raise) and the input field
* the input field
* *
* @param isMyTurn Indicates whether it is currently the player's turn. * @param isMyTurn Indicates whether it is currently the player's turn.
* @param isOut Indicates whether the player is currently out of the game * @param isOut Indicates whether the player is currently out of the game (folded or all-in).
* (folded or all-in).
*/ */
private void updateBasicButtons(boolean isMyTurn, boolean isOut) { private void updateBasicButtons(boolean isMyTurn, boolean isOut) {
@@ -100,8 +89,7 @@ public class TaskbarController {
} }
/** /**
* Sets the given button to a disabled state with red styling, indicating that * Sets the given button to a disabled state with red styling, indicating that the player is out
* the player is out
* *
* @param b The button to be styled as red and disabled * @param b The button to be styled as red and disabled
*/ */
@@ -117,8 +105,7 @@ public class TaskbarController {
} }
/** /**
* Sets the given input field to a disabled state with red styling, indicating * Sets the given input field to a disabled state with red styling, indicating that the player
* that the player
* is out * is out
* *
* @param t The text field to be styled as red and disabled * @param t The text field to be styled as red and disabled
@@ -135,8 +122,7 @@ public class TaskbarController {
} }
/** /**
* Activates the given button by enabling it and applying yellow styling, * Activates the given button by enabling it and applying yellow styling, indicating that it is
* indicating that it is
* the player's turn * the player's turn
* *
* @param b The button to be activated and styled for the player's turn * @param b The button to be activated and styled for the player's turn
@@ -152,8 +138,7 @@ public class TaskbarController {
} }
/** /**
* Activates the given input field by enabling it and applying yellow styling, * Activates the given input field by enabling it and applying yellow styling, indicating that
* indicating that
* it is the player's turn * it is the player's turn
* *
* @param t The text field to be activated and styled for the player's turn * @param t The text field to be activated and styled for the player's turn
@@ -169,8 +154,7 @@ public class TaskbarController {
} }
/** /**
* Deactivates the given button by disabling it and applying gray styling, * Deactivates the given button by disabling it and applying gray styling, indicating that it is
* indicating that it is
* not the player's turn * not the player's turn
* *
* @param b The button to be deactivated and styled for non-active state * @param b The button to be deactivated and styled for non-active state
@@ -187,8 +171,7 @@ public class TaskbarController {
} }
/** /**
* Deactivates the given input field by disabling it and applying gray styling, * Deactivates the given input field by disabling it and applying gray styling, indicating that
* indicating that
* it is not the player's turn * it is not the player's turn
* *
* @param t The text field to be deactivated and styled for non-active state * @param t The text field to be deactivated and styled for non-active state
@@ -205,8 +188,7 @@ public class TaskbarController {
} }
/** /**
* Updates the displayed amount of money the player has. The amount is shown in * Updates the displayed amount of money the player has. The amount is shown in the format "X$".
* the format "X$".
* *
* @param amount The amount of money to display for the player. * @param amount The amount of money to display for the player.
*/ */
@@ -220,8 +202,7 @@ public class TaskbarController {
} }
/** /**
* Initializes the taskbar controller. This method is called automatically after * Initializes the taskbar controller. This method is called automatically after the FXML
* the FXML
* components have been loaded. * components have been loaded.
*/ */
@FXML @FXML
@@ -230,10 +211,8 @@ public class TaskbarController {
} }
/** /**
* Updates the taskbar based on the current game state and the player's status. * Updates the taskbar based on the current game state and the player's status. It checks if
* It checks if * it's the player's turn and whether they are out of the game (folded or all-in) to adjust the
* it's the player's turn and whether they are out of the game (folded or
* all-in) to adjust the
* button states and displayed money accordingly. * button states and displayed money accordingly.
* *
* @param state * @param state
@@ -246,10 +225,11 @@ public class TaskbarController {
return; return;
} }
Player me = state.players.stream() Player me =
.filter(p -> myPlayerId.equals(p.getId())) state.players.stream()
.findFirst() .filter(p -> myPlayerId.equals(p.getId()))
.orElse(null); .findFirst()
.orElse(null);
if (me == null) { if (me == null) {
LOGGER.error("Player not found in GameState!"); LOGGER.error("Player not found in GameState!");
@@ -266,8 +246,7 @@ public class TaskbarController {
} }
/** /**
* Called when the taskbar is clicked with the mouse. Saves the relative * Called when the taskbar is clicked with the mouse. Saves the relative position for later,
* position for later,
* correct repositioning. * correct repositioning.
* *
* @param event The mouse event * @param event The mouse event
@@ -279,13 +258,10 @@ public class TaskbarController {
} }
/** /**
* Called while dragging the taskbar with the mouse. Updates the position and * Called while dragging the taskbar with the mouse. Updates the position and slightly scales
* slightly scales
* the taskbar for visual feedback. * the taskbar for visual feedback.
* *
* <p> * <p>TODO: It still needs to be fixed that the taskbar cannot disappear out of the window.
* TODO: It still needs to be fixed that the taskbar cannot disappear out of the
* window.
* *
* @param event Das Mausereignis * @param event Das Mausereignis
*/ */
@@ -299,8 +275,7 @@ public class TaskbarController {
} }
/** /**
* Called when the mouse cursor is released over the taskbar. Resets the taskbar * Called when the mouse cursor is released over the taskbar. Resets the taskbar scaling to
* scaling to
* normal size. * normal size.
* *
* @param event The mouse event * @param event The mouse event
@@ -324,8 +299,7 @@ public class TaskbarController {
} }
/** /**
* Called when the submit button in the taskbar is pressed. Triggers the * Called when the submit button in the taskbar is pressed. Triggers the processing of the
* processing of the
* deployment. * deployment.
*/ */
@FXML @FXML
@@ -386,8 +360,7 @@ public class TaskbarController {
} }
/** /**
* Refreshes the game state by fetching the latest state from the GameService * Refreshes the game state by fetching the latest state from the GameService and updating the
* and updating the
* taskbar accordingly. * taskbar accordingly.
*/ */
private void refreshGame() { private void refreshGame() {
@@ -402,28 +375,32 @@ public class TaskbarController {
} }
/** /**
* Called when the Exit button is clicked. Closes the current game stage and * Called when the Exit button is clicked. Closes the current game stage and opens the lobby UI.
* opens the lobby UI.
*/ */
@FXML @FXML
private void onExitButtonClick() { private void onExitButtonClick() {
javafx.application.Platform.runLater( javafx.application.Platform.runLater(
() -> { () -> {
// Close game stage // Close game stage
javafx.stage.Stage currentStage = (javafx.stage.Stage) taskbar.getScene().getWindow(); javafx.stage.Stage currentStage =
(javafx.stage.Stage) taskbar.getScene().getWindow();
currentStage.close(); currentStage.close();
// Start lobby UI // Start lobby UI
try { try {
javafx.stage.Stage newStage = new javafx.stage.Stage(); javafx.stage.Stage newStage = new javafx.stage.Stage();
javafx.fxml.FXMLLoader fxmlLoader = new javafx.fxml.FXMLLoader( javafx.fxml.FXMLLoader fxmlLoader =
getClass().getResource("/ui-structure/Casinomainui.fxml")); new javafx.fxml.FXMLLoader(
getClass().getResource("/ui-structure/Casinomainui.fxml"));
javafx.scene.Parent root = fxmlLoader.load(); javafx.scene.Parent root = fxmlLoader.load();
javafx.scene.Scene scene = new javafx.scene.Scene(root, 1200, 800); javafx.scene.Scene scene =
new javafx.scene.Scene(
root, Casinomainui.SCENE_WIDTH, Casinomainui.SCENE_HEIGHT);
newStage.setTitle("Casono"); newStage.setTitle("Casono");
javafx.scene.image.Image icon = new javafx.scene.image.Image( javafx.scene.image.Image icon =
getClass() new javafx.scene.image.Image(
.getResource("/images/logoinverted.png") getClass()
.toExternalForm()); .getResource("/images/logoinverted.png")
.toExternalForm());
newStage.getIcons().add(icon); newStage.getIcons().add(icon);
newStage.setScene(scene); newStage.setScene(scene);
newStage.setFullScreen(true); newStage.setFullScreen(true);
@@ -435,10 +412,8 @@ public class TaskbarController {
} }
/** /**
* Processes the stake entered in the text field. Only integer values between 5 * Processes the stake entered in the text field. Only integer values between 5 and 100,000
* and 100,000 * credits are accepted, in multiples of 5 (in increments of 5). The stake is currently only
* credits are accepted, in multiples of 5 (in increments of 5). The stake is
* currently only
* displayed on the console. * displayed on the console.
*/ */
private void processBet() { private void processBet() {
@@ -476,9 +451,7 @@ public class TaskbarController {
/** /**
* Opens the integrated Casono web browser. * Opens the integrated Casono web browser.
* *
* <p> * <p>TODO: Replace the start URL with the official project website (e.g., Tips & Tricks page)
* TODO: Replace the start URL with the official project website (e.g., Tips &
* Tricks page)
* once the content for strategies and support is available. * once the content for strategies and support is available.
*/ */
@FXML @FXML
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
+2 -2
View File
@@ -19,8 +19,8 @@ public class Casinomainui extends Application {
// Default constructor // Default constructor
} }
private static final int SCENE_WIDTH = 1200; public static final int SCENE_WIDTH = 1200;
private static final int SCENE_HEIGHT = 800; public static final int SCENE_HEIGHT = 800;
@Override @Override
/** /**