diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java index a367275..625960a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java @@ -415,11 +415,14 @@ public class Client { private void makeNewLobby(String data) { String[] params = data.split(":"); loungeSceneViewController.newLobby(params[0], params[1]); + LOGGER.debug("makeNewLobby() seems to have finnished"); + } private void addPlayerToLobby(String data) { String[] params = data.split(":"); loungeSceneViewController.addPlayerToLobby(params[0], params[1]); + LOGGER.debug("addPlayerToLobby() seems to have finnished"); } private void updateLobbyMembers(String data) { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ClientListItem.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ClientListItem.java index 8c815ea..7a8c598 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ClientListItem.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ClientListItem.java @@ -42,4 +42,5 @@ public class ClientListItem { public int clientID() { return id; } + } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java index e3f4fbc..2b3bdd6 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java @@ -110,4 +110,17 @@ public class LobbyListItem { public void setNoOfPlayersInLobby(int noOfPlayersInLobby) { this.noOfPlayersInLobby.set(noOfPlayersInLobby); } + + @Override + public String toString() { + return "LobbyListItem{" + + "lobbyID=" + lobbyID + + ", adminName=" + adminName + + ", clientsInLobby=" + clientsInLobby + + ", ownedByClient=" + ownedByClient + + ", isOpen=" + isOpen + + ", MAX_CAPACITY=" + MAX_CAPACITY + + ", noOfPlayersInLobby=" + noOfPlayersInLobby + + '}'; + } } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java index 5a8a9b7..545c66c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java @@ -32,13 +32,14 @@ import javafx.scene.layout.AnchorPane; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; import javafx.scene.text.Text; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class LoungeSceneViewController implements Initializable { - public static final Logger LOGGER = LogManager.getLogger(JServerProtocolParser.class); + public static final Logger LOGGER = LogManager.getLogger(LoungeSceneViewController.class); public static final BudaLogConfig l = new BudaLogConfig(LOGGER); @FXML @@ -170,7 +171,9 @@ public class LoungeSceneViewController implements Initializable { } else { LOGGER.debug("In updateItem(item, empty) Method. Else branch -> nonnull item"); name.setText(item.getName()); + name.setTextFill(Color.BLACK); id.setText(String.valueOf(item.getId())); + id.setTextFill(Color.BLACK); setGraphic(nameAndId); } } @@ -261,7 +264,10 @@ public class LoungeSceneViewController implements Initializable { } }); startOrJoin.setText(item.isOwnedByClient() ? "Start" : "Join"); - setGraphic(headParent); + lobbyID.setTextFill(Color.BLACK); + adminName.setTextFill(Color.BLACK); + startOrJoin.setTextFill(Color.BLACK); + setGraphic(head); } } }; @@ -269,6 +275,7 @@ public class LoungeSceneViewController implements Initializable { }); LobbyListView.setPlaceholder(new Text("No open lobbies!")); + LobbyListView.setVisible(true); } public void addGameView(){ @@ -336,7 +343,16 @@ public class LoungeSceneViewController implements Initializable { } LobbyListItem item = new LobbyListItem(id, admin, new SimpleBooleanProperty(ownedByClient), new SimpleBooleanProperty(true), new SimpleIntegerProperty(0)); - lobbies.add(item); + Platform.runLater(new Runnable() { + @Override + public void run() { + lobbies.add(item); + LOGGER.debug("within newLobby() run() thread"); + LOGGER.debug(item.toString()); + } + }); + LOGGER.debug("newLobby() in LoungeSceneViewController seems to have reached end."); + LOGGER.debug(lobbies.toString()); } public void joinGame(String lobbyID) { @@ -362,7 +378,16 @@ public class LoungeSceneViewController implements Initializable { * @param s */ public void addClientToList(String s) { - clients.add(new ClientListItem(s)); + ClientListItem cl = new ClientListItem(s); + Platform.runLater(new Runnable() { + @Override + public void run() { + clients.add(cl); + LOGGER.debug("in addClientToList() in run()"); + LOGGER.debug(cl.toString() + " in run()"); + } + }); + } public void newGame() {