Merging game lobby with game state broadcast. Merge conflicts resolved.

Port numbers updated to 4942.

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

@@ -220,6 +220,7 @@ public class LobbyController implements Initializable, Observer{
 
     @FXML
     public void readyButtonPressed() {
+        setContentPane("/views/RaceView.fxml");
         GameState.setCurrentStage(GameStages.RACING);
     }
 

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

@@ -96,12 +96,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         startingBoats = new ArrayList<>(ClientPacketParser.getBoats().values());
 
         includedCanvasController.setup(this);
-//        includedCanvasController.initializeCanvas();
+        includedCanvasController.initializeCanvas();
         initializeUpdateTimer();
         initialiseFPSCheckBox();
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
-//        includedCanvasController.timer.start();
+        includedCanvasController.timer.start();
         selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
 
     }

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

@@ -75,7 +75,8 @@ public class StartScreenController {
             new MainServerThread();
             ClientState.setHost(true);
             // host will connect and handshake to itself after setting up the server
-            ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4950);
+            // TODO: 24/07/17 wmu16 - Make port number some static global type constant?
+            ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4942);
             ClientState.setConnectedToHost(true);
             controller.setClientToServerThread(clientToServerThread);
             setContentPane("/views/LobbyView.fxml");

src/main/java/seng302/gameServer/GameServerThread.java

@@ -18,7 +18,7 @@ import java.util.*;
 public class GameServerThread implements Runnable, Observer, ClientConnectionDelegate{
     
     private static final Integer MAX_NUM_PLAYERS = 10;
-    public static final int PORT_NUMBER = 4950;
+    public static final int PORT_NUMBER = 4942;
 
     private Boolean hosting = true;
     

src/main/java/seng302/gameServer/MainServerThread.java

@@ -17,7 +17,7 @@ import java.util.concurrent.PriorityBlockingQueue;
  */
 public class MainServerThread implements Runnable, PacketBufferDelegate, ClientConnectionDelegate{
 
-    private static final int PORT = 4950;
+    private static final int PORT = 4942;
     private static final Integer MAX_NUM_PLAYERS = 3;
     private static final int LOG_LEVEL = 1;
 

src/main/resources/views/StartScreenView.fxml

@@ -47,7 +47,7 @@
             <Font size="21.0" />
          </font>
       </Text>
-      <TextField fx:id="portTextField" alignment="CENTER" maxWidth="75.0" prefHeight="25.0" prefWidth="55.0" promptText="Port" text="4950" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+      <TextField fx:id="portTextField" alignment="CENTER" maxWidth="75.0" prefHeight="25.0" prefWidth="55.0" promptText="Port" text="4942" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
          <opaqueInsets>
             <Insets />
          </opaqueInsets>