LobbyView now can change to RaceView upon race start packet received.

Added port number text field in start screen controller.
Created a client state.

#story[1055] #pair[hyi25, zyt10]

src/main/java/seng302/client/ClientPacketParser.java

@@ -36,8 +36,6 @@ public class ClientPacketParser {
 
     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> markLocations = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatLocations = new ConcurrentHashMap<>();
-    private String threadName;
-    private Thread t;
     private static boolean newRaceXmlReceived = false;
     private static boolean raceStarted = false;
     private static XMLParser xmlObject;
@@ -48,11 +46,10 @@ public class ClientPacketParser {
     private static Map<Integer, Yacht> boatsPos = new ConcurrentSkipListMap<>();
     private static double windDirection = 0;
     private static Double windSpeed = 0d;
-     private static Long currentTimeLong;
+    private static Long currentTimeLong;
     private static String currentTimeString;
     private static boolean appRunning;
 
-
      //CONVERSION CONSTANTS
     private static final Double MS_TO_KNOTS = 1.94384;
 
@@ -121,7 +118,7 @@ public class ClientPacketParser {
      */
     private static void extractHeartBeat(StreamPacket packet) {
         long heartbeat = bytesToLong(packet.getPayload());
-        System.out.println("heartbeat = " + heartbeat);
+        System.out.println("[CLIENT] Received heartbeat = " + heartbeat);
     }
 
     private static String getTimeZoneString() {
@@ -200,6 +197,9 @@ public class ClientPacketParser {
             Long estTimeAtFinish = bytesToLong(
                 Arrays.copyOfRange(payload, 38 + (i * 20), 44 + (i * 20)));
             boat.setEstimateTimeAtFinish(estTimeAtFinish);
+
+//            FOR DEBUGGING:
+
 //            boatsPos.put(estTimeAtFinish, boat);
 //            String boatStatus = "SourceID: " + boatStatusSourceID;
 //            boatStatus += "\nBoat Status: " + (int)payload[28 + (i * 20)];

src/main/java/seng302/client/ClientState.java

@@ -0,0 +1,46 @@
+package seng302.client;
+
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
+/**
+ * Created by zyt10 on 21/07/17.
+ */
+public class ClientState {
+
+    private static String hostIp = "";
+    private static Boolean isHost = false;
+    private static Boolean raceStarted = false;
+    private static Boolean connectedToHost = false;
+
+    public static String getHostIp() {
+        return hostIp;
+    }
+
+    public static void setHostIp(String hostIp) {
+        ClientState.hostIp = hostIp;
+    }
+
+    public static Boolean isHost() {
+        return isHost;
+    }
+
+    public static void setHost(Boolean isHost) {
+        ClientState.isHost = isHost;
+    }
+
+    public static Boolean isRaceStarted() {
+        return raceStarted;
+    }
+
+    public static void setRaceStarted(Boolean raceStarted) {
+        ClientState.raceStarted = raceStarted;
+    }
+
+    public static Boolean isConnectedToHost() {
+        return connectedToHost;
+    }
+
+    public static void setConnectedToHost(Boolean connectedToHost) {
+        ClientState.connectedToHost = connectedToHost;
+    }
+}

src/main/java/seng302/client/ClientStateQueryingRunnable.java

@@ -0,0 +1,28 @@
+package seng302.client;
+
+import java.util.List;
+import java.util.Observable;
+
+/**
+ * Created by zyt10 on 21/07/17.
+ */
+public class ClientStateQueryingRunnable extends Observable implements Runnable {
+
+    private Boolean terminate = false;
+
+    public ClientStateQueryingRunnable() {}
+
+    @Override
+    public void run() {
+        while(!terminate) {
+            if (ClientState.isRaceStarted() && ClientState.isConnectedToHost()) {
+                setChanged();
+                notifyObservers();
+            }
+        }
+    }
+
+    public void terminate() {
+        terminate = true;
+    }
+}

src/main/java/seng302/client/ClientToServerThread.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
@@ -25,14 +26,10 @@ public class ClientToServerThread extends Thread {
     private Boolean updateClient = true;
     private  ByteArrayOutputStream crcBuffer;
 
-    public ClientToServerThread(String ipAddress, Integer portNumber){
-        try {
+    public ClientToServerThread(String ipAddress, Integer portNumber) throws Exception{
             socket = new Socket(ipAddress, portNumber);
             is = socket.getInputStream();
             os = socket.getOutputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
 
     }
 
@@ -46,7 +43,7 @@ public class ClientToServerThread extends Thread {
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
-        while(true) {
+        while(ClientState.isConnectedToHost()) {
             try {
                 //Perform a write if it is time to as delegated by the MainServerThread
                 if (updateClient) {