From 1d9dd763567786ef0513e6908960330eb7b7fbdf Mon Sep 17 00:00:00 2001 From: Zhi You Tan Date: Thu, 27 Jul 2017 13:12:53 +1200 Subject: [PATCH] For client's lobby view, it now can shows the connected host IP #story[1055] --- src/main/java/seng302/controllers/LobbyController.java | 2 +- src/main/java/seng302/controllers/StartScreenController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java index bd4b5351..b9d407fe 100644 --- a/src/main/java/seng302/controllers/LobbyController.java +++ b/src/main/java/seng302/controllers/LobbyController.java @@ -111,7 +111,7 @@ public class LobbyController implements Initializable, Observer{ readyButton.setDisable(false); } else { - lobbyIpText.setText("Connected to IP: "); + lobbyIpText.setText("Connected to IP: " + ClientState.getHostIp()); readyButton.setDisable(true); } diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java index 8c1c8531..b7376287 100644 --- a/src/main/java/seng302/controllers/StartScreenController.java +++ b/src/main/java/seng302/controllers/StartScreenController.java @@ -109,6 +109,7 @@ public class StartScreenController { ClientState.setHost(false); ClientState.setConnectedToHost(true); + ClientState.setHostIp(ipAddress); controller.setClientToServerThread(clientToServerThread); LobbyController lobbyController = (LobbyController) setContentPane("/views/LobbyView.fxml"); lobbyController.setController(controller);