seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trying to get the join button to work

Browse Source
This commit is contained in:
Sebastian Lenzlinger 2022-05-01 16:24:53 +02:00
parent 87e465099a
commit a4a12fc9d2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java
View File

@ -26,6 +26,7 @@ public class LobbyListItem {
private final int MAX_CAPACITY = 6; private final int MAX_CAPACITY = 6;
private SimpleIntegerProperty noOfPlayersInLobby; private SimpleIntegerProperty noOfPlayersInLobby;
public LobbyListItem(SimpleStringProperty lobbyID, SimpleStringProperty adminName, public LobbyListItem(SimpleStringProperty lobbyID, SimpleStringProperty adminName,
SimpleBooleanProperty ownedByClient, SimpleBooleanProperty isOpen, SimpleBooleanProperty ownedByClient, SimpleBooleanProperty isOpen,
SimpleIntegerProperty noOfPlayersInLobby) { SimpleIntegerProperty noOfPlayersInLobby) {

4
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
View File

@ -120,6 +120,7 @@ public class LoungeSceneViewController implements Initializable {
newGameButton.setOnAction(event -> newGame()); newGameButton.setOnAction(event -> newGame());
LobbyListView.setVisible(true); LobbyListView.setVisible(true);
lListView = LobbyListView; lListView = LobbyListView;
cListView = ClientListView;
LOGGER.debug("Lobby in initialize" + LobbyListView); LOGGER.debug("Lobby in initialize" + LobbyListView);
ClientListView.setVisible(true); ClientListView.setVisible(true);
ClientListView.setItems(clients); ClientListView.setItems(clients);
@ -216,6 +217,7 @@ public class LoungeSceneViewController implements Initializable {
{ {
head.setAlignment(Pos.CENTER_LEFT); head.setAlignment(Pos.CENTER_LEFT);
head.setSpacing(5);
playerList.setAlignment(Pos.CENTER_LEFT); playerList.setAlignment(Pos.CENTER_LEFT);
headParent.setCollapsible(true); headParent.setCollapsible(true);
} }
@ -372,7 +374,6 @@ public class LoungeSceneViewController implements Initializable {
SimpleStringProperty id = new SimpleStringProperty(lobbyID); SimpleStringProperty id = new SimpleStringProperty(lobbyID);
SimpleStringProperty admin = new SimpleStringProperty((adminName)); SimpleStringProperty admin = new SimpleStringProperty((adminName));
LOGGER.debug("In newLobby()1 LobbyListView" + LobbyListView); LOGGER.debug("In newLobby()1 LobbyListView" + LobbyListView);
Button startOrJoin;
boolean ownedByClient = false; boolean ownedByClient = false;
if (adminName.equals(client.getUsername())) { if (adminName.equals(client.getUsername())) {
LOGGER.debug("Client is admin. Name: " + adminName); LOGGER.debug("Client is admin. Name: " + adminName);
@ -423,6 +424,7 @@ public class LoungeSceneViewController implements Initializable {
*/ */
public void addClientToList(String s) { public void addClientToList(String s) {
ClientListItem cl = new ClientListItem(s); ClientListItem cl = new ClientListItem(s);
ClientListView = cListView;
Platform.runLater(new Runnable() { Platform.runLater(new Runnable() {
@Override @Override
public void run() { public void run() {

8
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
View File

@ -65,7 +65,8 @@ public class JServerProtocolParser {
} catch (Exception e) { } catch (Exception e) {
h.setUsernameOnLogin("U.N. Owen"); h.setUsernameOnLogin("U.N. Owen");
} }
h.guiUpdateAll(Protocol.printToGUI+"$"+GuiParameters.newPlayerOnServer+"$"+h.getClientUserName()); h.guiUpdateAll(Protocol.printToGUI + "$" + GuiParameters.newPlayerOnServer + "$"
+ h.getClientUserName());
break; break;
case Protocol.nameChange: case Protocol.nameChange:
h.changeUsername(msg.substring(6)); h.changeUsername(msg.substring(6));
@ -83,6 +84,7 @@ public class JServerProtocolParser {
try { try {
int i = Integer.parseInt(msg.substring(6, 7)); int i = Integer.parseInt(msg.substring(6, 7));
h.joinLobby(i); h.joinLobby(i);
//h.guiUpdateAll(Protocol.printToGUI+"$"+GuiParameters.addNewMemberToLobby+"$"+i+":"+h.getClientUserName()); handled in joinLobby()
} catch (Exception e) { } catch (Exception e) {
h.sendMsgToClient(Protocol.printToClientConsole h.sendMsgToClient(Protocol.printToClientConsole
+ "$Invalid input. Please use JOINL$1 to join Lobby 1, for example."); + "$Invalid input. Please use JOINL$1 to join Lobby 1, for example.");
@ -90,11 +92,9 @@ public class JServerProtocolParser {
break; break;
case Protocol.createNewLobby: case Protocol.createNewLobby:
h.createNewLobby(); h.createNewLobby();
h.sendMsgToClient( h.guiUpdateAll(
Protocol.printToGUI + "$" + GuiParameters.newLobbyCreated + "$" + h.getLobby() Protocol.printToGUI + "$" + GuiParameters.newLobbyCreated + "$" + h.getLobby()
.getLobbyID() + ":" + h.getClientUserName()); .getLobbyID() + ":" + h.getClientUserName());
h.guiUpdateAll(Protocol.printToGUI + "$" + GuiParameters.newLobbyCreated + "$" + h.getLobby()
.getLobbyID() + ":" + h.getClientUserName());
LOGGER.info("Here"); LOGGER.info("Here");
break; break;
case Protocol.listLobbies: case Protocol.listLobbies: