From 9d9321522d44f39deef55b0bf2e75986befba928 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Mon, 24 Jul 2017 12:36:45 +1200
Subject: [PATCH] Linked the first fxml id tags from the fxml files for the new
 start up screens #story[1087]

---
 .../Controllers/ConnectionController.java     | 46 +++++++++++++++++--
 .../resources/visualiser/scenes/lobby.fxml    |  2 +-
 .../resources/visualiser/scenes/title.fxml    |  2 +-
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java b/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
index 7dacbd5e..59a4ece2 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
@@ -3,13 +3,11 @@ package visualiser.Controllers;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import visualiser.model.RaceConnection;
 
+import javax.xml.soap.Text;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
@@ -35,6 +33,46 @@ public class ConnectionController extends Controller {
     @FXML
     private TextField portField;
 
+
+    /*Title Screen fxml items*/
+    @FXML
+    private Button hostGameTitleBtn;
+    @FXML
+    private Button connectGameBtn;
+    @FXML
+    private RadioButton nightRadioBtn;
+    @FXML
+    private RadioButton dayRadioButton;
+
+    /*Lobby fxml items*/
+    @FXML
+    private TableView lobbyTable;
+    @FXML
+    private TableColumn gameNameColumn;
+    @FXML
+    private TableColumn hostNameColumn;
+    @FXML
+    private TableColumn playerCountColumn;
+    @FXML
+    private TextField playerNameField;
+    @FXML
+    private Button joinGameBtn;
+
+    /*Host game fxml items*/
+    @FXML
+    private TextField gameNameField;
+    @FXML
+    private TextField hostNameField;
+    @FXML
+    private TextField hostGameBtn;
+
+
+
+
+
+
+
+
     private ObservableList<RaceConnection> connections;
 
     @Override
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
index 1dd34e7d..14963a5d 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
@@ -40,7 +40,7 @@
                   <Insets left="50.0" />
                </GridPane.margin>
             </TextField>
-            <Button fx:id="connectGameBtn" mnemonicParsing="false" text="Connect to Game" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+            <Button fx:id="joinGameBtn" mnemonicParsing="false" text="Connect to Game" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
                <GridPane.margin>
                   <Insets right="50.0" />
                </GridPane.margin>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
index f87d14d4..48870b1f 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
@@ -21,7 +21,7 @@
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Button fx:id="hostGameBtn" maxWidth="204.0" mnemonicParsing="false" text="Host Game" GridPane.halignment="LEFT" GridPane.rowIndex="1">
+            <Button fx:id="hostGameTitleBtn" maxWidth="204.0" mnemonicParsing="false" text="Host Game" GridPane.halignment="LEFT" GridPane.rowIndex="1">
                <font>
                   <Font size="20.0" />
                </font>