Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes

# Conflicts:
#	src/main/java/seng302/controllers/LobbyController.java
#	src/main/java/seng302/gameServer/MainServerThread.java

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

@@ -1,15 +1,23 @@
 package seng302.controllers;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.control.ListView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.text.Text;
+import seng302.gameServer.GameServerThread;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
-
+import seng302.gameServerWithThreading.MainServerThread;
-import java.io.IOException;
+import seng302.gameServerWithThreading.ServerToClientThread;
 
 /**
  * A class describing the actions of the lobby screen
@@ -17,11 +25,16 @@ import java.io.IOException;
  */
 public class LobbyController {
 
+    @FXML
+    private ListView competitorsListView;
     @FXML
     private GridPane lobbyScreen;
     @FXML
     private Text lobbyIpText;
 
+    private GameServerThread gameServerThread;
+    private static ObservableList competitors;
+
     private void setContentPane(String jfxUrl) {
         try {
             AnchorPane contentPane = (AnchorPane) lobbyScreen.getParent();
@@ -37,6 +50,11 @@ public class LobbyController {
         }
     }
 
+    public void initialize() {
+        competitors = FXCollections.observableArrayList();
+        competitorsListView.setItems(competitors);
+    }
+
 
     @FXML
     public void leaveLobbyButtonPressed() {
@@ -44,12 +62,21 @@ public class LobbyController {
         setContentPane("/views/StartScreenView.fxml");
         System.out.println("Leaving lobby!");
         GameState.setCurrentStage(GameStages.CANCELLED);
+        gameServerThread.terminateGame();
     }
 
+    public static void refreshCompetitors(){
+        Collection<String> competitorsIps = MainServerThread.getServerToClientThreads();
+        competitors.clear();
+        competitors.addAll(competitorsIps);
+    }
 
     @FXML
     public void readyButtonPressed() {
         GameState.setCurrentStage(GameStages.RACING);
     }
 
+    protected void setGameServerThread(GameServerThread gameServerThread) {
+        this.gameServerThread = gameServerThread;
+    }
 }

src/main/java/seng302/controllers/StartScreenController.java

@@ -78,10 +78,14 @@ public class StartScreenController {
     public void connectButtonPressed() {
         // TODO: 10/07/17 wmu16 - Finish function
         String ipAddress = ipTextField.getText().trim().toLowerCase();
-        ClientToServerThread clientToServerThread = new ClientToServerThread(ipAddress, 4950);
+        try {
-        controller.setClientToServerThread(clientToServerThread);
+            ClientToServerThread clientToServerThread = new ClientToServerThread(ipAddress, 4950);
-        clientToServerThread.start();
+            controller.setClientToServerThread(clientToServerThread);
-
+            clientToServerThread.start();
+            setContentPane("/views/LobbyView.fxml");
+        } catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     public void setController(Controller controller) {

src/main/resources/views/LobbyView.fxml

@@ -15,7 +15,7 @@
 
 <GridPane fx:id="lobbyScreen" nodeOrientation="LEFT_TO_RIGHT" prefHeight="533.0" prefWidth="802.0" style="-fx-background-color: #2C2c36;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.LobbyController">
     <columnConstraints>
-      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
     </columnConstraints>
     <rowConstraints>
       <RowConstraints maxHeight="171.0" minHeight="0.0" prefHeight="31.0" vgrow="SOMETIMES" />
@@ -41,6 +41,27 @@
             <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
          </children>
       </GridPane>
-      <AnchorPane focusTraversable="true" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
+      <AnchorPane focusTraversable="true" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
+         <children>
+            <GridPane layoutX="335.0" layoutY="146.0" prefHeight="399.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+              <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="0.0" prefWidth="2.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="0.0" prefWidth="2.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints maxHeight="125.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="266.0" minHeight="10.0" prefHeight="266.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                     <children>
+                        <ListView fx:id="competitorsListView" layoutX="154.0" layoutY="59.0" prefHeight="266.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                     </children>
+                  </AnchorPane>
+               </children>
+            </GridPane>
+         </children></AnchorPane>
    </children>
 </GridPane>