From bf427f24d355aced3723797ddcad4930834d0927 Mon Sep 17 00:00:00 2001 From: Alistair McIntyre Date: Thu, 14 Sep 2017 13:34:48 +1200 Subject: [PATCH] - Created a Race Finish Dialog. tags : #story[1245] --- .../java/seng302/visualiser/GameClient.java | 24 +--------------- .../dialogs/FinishDialogController.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java index eef70b59..445af5a7 100644 --- a/src/main/java/seng302/visualiser/GameClient.java +++ b/src/main/java/seng302/visualiser/GameClient.java @@ -76,17 +76,6 @@ public class GameClient { */ public GameClient(Pane holder) { this.holderPane = holder; -// if (holderPane.getParent() == null) { -// this.holderPane.parentProperty().addListener(((observable, oldValue, newValue) -> { -// if (newValue != null) { -// newValue.getScene().setOnKeyPressed(this::keyPressed); -// newValue.getScene().setOnKeyReleased(this::keyReleased); -// } -// })); -// } else { -// this.holderPane.getParent().getScene().setOnKeyPressed(this::keyPressed); -// this.holderPane.getParent().getScene().setOnKeyReleased(this::keyReleased); -// } } /** @@ -117,22 +106,10 @@ public class GameClient { ViewManager.getInstance().setProperty("serverName", regattaData.getRegattaName()); ViewManager.getInstance().setProperty("mapName", regattaData.getCourseName()); - // TODO disable ready button; - - //LobbyController_old lobbyController = loadLobby(); - //lobbyController.setSocketThread(socketThread); - //lobbyController.setPlayerID(socketThread.getClientId()); - //lobbyController.setPlayerListSource(clientLobbyList); - //lobbyController.disableReadyButton(); - - - -// lobbyController.addCloseListener((exitCause) -> this.loadStartScreen()); this.lobbyController = ViewManager.getInstance().goToLobby(true); } catch (IOException ioe) { showConnectionError("Unable to find server"); - //Platform.runLater(this::loadStartScreen); } } @@ -214,6 +191,7 @@ public class GameClient { Sounds.stopMusic(); Sounds.stopSoundEffects(); Sounds.playFinishMusic(); + System.out.println("ITS WORKING HERE"); FXMLLoader fxmlLoader = loadFXMLToHolder("/views/FinishScreenView.fxml"); FinishScreenViewController controller = fxmlLoader.getController(); controller.setFinishers(raceState.getPlayerPositions()); diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java b/src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java new file mode 100644 index 00000000..64358399 --- /dev/null +++ b/src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java @@ -0,0 +1,28 @@ +package seng302.visualiser.controllers.dialogs; + + +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXListView; +import java.awt.Label; +import java.net.URL; +import java.util.ResourceBundle; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import seng302.visualiser.controllers.ViewManager; + +public class FinishDialogController implements Initializable { + + //--------FXML BEGIN--------// + @FXML + private Label raceFinishLabel; + @FXML + private JFXListView finishersList; + @FXML + private JFXButton playAgain; + //---------FXML END---------// + + @Override + public void initialize(URL location, ResourceBundle resources) { + playAgain.setOnAction(event -> ViewManager.getInstance().goToStartView()); + } +}