- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.

tags : #story[1245]

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -91,7 +91,6 @@ public class LobbyController implements Initializable {
 
         Platform.runLater(() -> {
             Integer playerId = ViewManager.getInstance().getGameClient().getServerThread().getClientId();
-            String name = ViewManager.getInstance().getGameClient().getPlayerNames().get(playerId - 1);
 
             playersColor = Colors.getColor(playerId - 1);
             customizationDialog = createCustomizeDialog();

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -1,6 +1,7 @@
 package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialog;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,9 +56,10 @@ import seng302.visualiser.GameView3D;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
+import seng302.visualiser.controllers.dialogs.FinishDialogController;
 import seng302.visualiser.fxObjects.ChatHistory;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 import seng302.visualiser.fxObjects.assets_2D.WindArrow;
+import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
  * Controller class that manages the display of a race
@@ -124,11 +126,15 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Polyline windArrow = new WindArrow(Color.LIGHTGRAY);
     private ObservableList<ClientYacht> selectionComboBoxList = FXCollections.observableArrayList();
     private ClientYacht player;
+    private JFXDialog finishScreenDialog;
+    private FinishDialogController finishDialogController;
 
     public void initialize() {
         Sounds.stopMusic();
         Sounds.playRaceMusic();
 
+        finishScreenDialog = createFinishDialog();
+
         // Load a default important annotation state
         //importantAnnotations = new ImportantAnnotationsState();
 
@@ -191,6 +197,31 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
     }
 
+    public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
+        raceState.setRaceStarted(false);
+        finishDialogController.setFinishedBoats(finishedBoats);
+        ViewManager.getInstance().getGameClient().stopGame();
+        finishScreenDialog.show();
+    }
+
+    private JFXDialog createFinishDialog() {
+        FXMLLoader dialog = new FXMLLoader(
+            getClass().getResource("/views/dialogs/RaceFinishDialog.fxml"));
+
+        JFXDialog finishScreenDialog = null;
+
+        try {
+            finishScreenDialog = new JFXDialog(contentAnchorPane, dialog.load(),
+                JFXDialog.DialogTransition.CENTER);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        finishDialogController = dialog.getController();
+
+        return finishScreenDialog;
+    }
+
     public void loadRace (
         Map<Integer, ClientYacht> participants, RaceXMLData raceData, RaceState raceState,
         ClientYacht player) {

src/main/java/seng302/visualiser/controllers/ViewManager.java

@@ -248,14 +248,12 @@ public class ViewManager {
 
     public RaceViewController loadRaceView() {
         FXMLLoader loader = loadFxml("/views/RaceView.fxml");
-
         // have to create a new stage and set the race view maximized as JFoenix decorator has
         // bug causes stage cannot be fully maximised.
         Platform.runLater(() -> {
             try {
                 stage.close();
                 stage = new Stage();
-
                 JFXDecorator decorator = new JFXDecorator(stage, loader.load(), false, true, true);
                 decorator.setCustomMaximize(true);
                 decorator.applyCss();
@@ -263,6 +261,8 @@ public class ViewManager {
                     .add(getClass().getResource("/css/Master.css").toExternalForm());
                 setDecorator(decorator);
                 Scene scene = new Scene(decorator);
+                RaceViewController raceViewController = loader.getController();
+                gameClient.setRaceViewController(raceViewController);
                 // set key press event to catch key stoke
                 scene.setOnKeyPressed(gameClient::keyPressed);
                 scene.setOnKeyReleased(gameClient::keyReleased);

src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java

@@ -3,11 +3,13 @@ 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.ArrayList;
 import java.util.ResourceBundle;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.Label;
+import seng302.model.ClientYacht;
 import seng302.visualiser.controllers.ViewManager;
 
 public class FinishDialogController implements Initializable {
@@ -16,7 +18,7 @@ public class FinishDialogController implements Initializable {
     @FXML
     private Label raceFinishLabel;
     @FXML
-    private JFXListView finishersList;
+    private JFXListView<Label> finishersList;
     @FXML
     private JFXButton playAgain;
     //---------FXML END---------//
@@ -25,4 +27,11 @@ public class FinishDialogController implements Initializable {
     public void initialize(URL location, ResourceBundle resources) {
         playAgain.setOnAction(event -> ViewManager.getInstance().goToStartView());
     }
+
+    public void setFinishedBoats(ArrayList<ClientYacht> finishedBoats) {
+        finishersList.getItems().clear();
+        for (ClientYacht yacht : finishedBoats) {
+            finishersList.getItems().add(new Label(yacht.getBoatName()));
+        }
+    }
 }