From 1ce8df976cb6848dda6961d4b6d8aad92ccf62dc Mon Sep 17 00:00:00 2001
From: Zhi You Tan <ryan_zhiyou@hotmail.com>
Date: Mon, 11 Sep 2017 16:08:24 +1200
Subject: [PATCH] changed name: contentanchorpane to contentgridpane

#story[1248]
---
 .../controllers/RaceViewController.java          | 16 +++++++---------
 src/main/resources/views/RaceView.fxml           |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 7f6a14b6..48a91eee 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -27,7 +27,6 @@ import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Slider;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
@@ -44,7 +43,6 @@ import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.token.Token;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameView;
 import seng302.visualiser.controllers.annotations.Annotation;
@@ -80,7 +78,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private Text timerLabel;
     @FXML
-    private GridPane contentAnchorPane;
+    private GridPane contentGridPane;
     @FXML
     private Text windArrowText, windDirectionText;
     @FXML
@@ -143,8 +141,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 //        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
 //            chatHistory.setScrollTop(Double.MAX_VALUE);
 //        });
-        contentAnchorPane.setOnMouseClicked((event) ->
-                contentAnchorPane.requestFocus()
+        contentGridPane.setOnMouseClicked((event) ->
+            contentGridPane.requestFocus()
         );
     }
 
@@ -169,7 +167,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         updateOrder(raceState.getPlayerPositions());
         gameView = new GameView();
         gameView.setFrameRateFXText(fpsDisplay);
-        Platform.runLater(() -> contentAnchorPane.getChildren().add(0, gameView));
+        Platform.runLater(() -> contentGridPane.getChildren().add(0, gameView));
         gameView.setBoats(new ArrayList<>(participants.values()));
         gameView.updateBorder(raceData.getCourseLimit());
         gameView.updateTokens(raceData.getTokens());
@@ -591,9 +589,9 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
 
         try {
-            contentAnchorPane.getChildren().removeAll();
-            contentAnchorPane.getChildren().clear();
-            contentAnchorPane.getChildren().addAll((Pane) loader.load());
+            contentGridPane.getChildren().removeAll();
+            contentGridPane.getChildren().clear();
+            contentGridPane.getChildren().addAll((Pane) loader.load());
 
         } catch (javafx.fxml.LoadException e) {
             System.err.println(e.getCause().toString());
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 76cfb22d..b04311c0 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -61,7 +61,7 @@
                                   vgrow="SOMETIMES"/>
                             </rowConstraints>
                             <children>
-                                <GridPane fx:id="contentAnchorPane" GridPane.columnSpan="2"
+                                <GridPane fx:id="contentGridPane" GridPane.columnSpan="2"
                                   GridPane.rowSpan="3">
                                     <columnConstraints>
                                         <ColumnConstraints hgrow="SOMETIMES"/>