Implemented list views initialisation which will set the first pane to be your source id (after three way handshake) and the remaining pane to be the source id of other players based on boats.xml received.

Updated client parser and client state to save a list of player's boat

WIP: refresh list view to show the latest update in players

#story[1055]

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

@@ -38,7 +38,7 @@ public class ClientPacketParser {
     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatLocations = new ConcurrentHashMap<>();
     private static boolean newRaceXmlReceived = false;
     private static boolean raceStarted = false;
-    private static XMLParser xmlObject;
+    private static XMLParser xmlObject = new XMLParser();
     private static boolean raceFinished = false;
     private static boolean streamStatus = false;
     private static long timeSinceStart = -1;
@@ -49,6 +49,7 @@ public class ClientPacketParser {
     private static Long currentTimeLong;
     private static String currentTimeString;
     private static boolean appRunning;
+    private static Map<Integer, Yacht> clientStateBoats = new ConcurrentHashMap<>();
 
      //CONVERSION CONSTANTS
     private static final Double MS_TO_KNOTS = 1.94384;
@@ -185,44 +186,35 @@ public class ClientPacketParser {
 
         int noBoats = payload[22];
         int raceType = payload[23];
+        clientStateBoats = ClientState.getBoats();
         for (int i = 0; i < noBoats; i++) {
             long boatStatusSourceID = bytesToLong(
                 Arrays.copyOfRange(payload, 24 + (i * 20), 28 + (i * 20)));
-            Yacht boat = boats.get((int) boatStatusSourceID);
-            boat.setBoatStatus((int) payload[28 + (i * 20)]);
-            setBoatLegPosition(boat, (int) payload[29 + (i * 20)]);
-            boat.setPenaltiesAwarded((int) payload[30 + (i * 20)]);
-            boat.setPenaltiesServed((int) payload[31 + (i * 20)]);
-            Long estTimeAtNextMark = bytesToLong(
+            int boatStatus = (int) payload[28 + (i * 20)];
+            int boatLegNumber = (int) payload[29 + (i * 20)];
+            int boatPenaltyAwarded = (int) payload[30 + (i * 20)];
+            int boatPenaltyServed = (int) payload[31 + (i * 20)];
+            long estTimeAtNextMark = bytesToLong(
                 Arrays.copyOfRange(payload, 32 + (i * 20), 38 + (i * 20)));
-            boat.setEstimateTimeAtNextMark(estTimeAtNextMark);
-            Long estTimeAtFinish = bytesToLong(
+            long estTimeAtFinish = bytesToLong(
                 Arrays.copyOfRange(payload, 38 + (i * 20), 44 + (i * 20)));
+
+            Yacht boat = boats.get((int) boatStatusSourceID);
+            boat.setBoatStatus((boatStatus));
+            setBoatLegPosition(boat, boatLegNumber);
+            boat.setPenaltiesAwarded(boatPenaltyAwarded);
+            boat.setPenaltiesServed(boatPenaltyServed);
+            boat.setEstimateTimeAtNextMark(estTimeAtNextMark);
             boat.setEstimateTimeAtFinish(estTimeAtFinish);
 
-//            FOR DEBUGGING:
-
-//            boatsPos.put(estTimeAtFinish, boat);
-//            String boatStatus = "SourceID: " + boatStatusSourceID;
-//            boatStatus += "\nBoat Status: " + (int)payload[28 + (i * 20)];
-//            boatStatus += "\nLegNumber: " + (int)payload[29 + (i * 20)];
-//            boatStatus += "\nPenaltiesAwarded: " + (int)payload[29 + (i * 20)];
-//            boatStatus += "\nPenaltiesServed: " + (int)payload[30 + (i * 20)];
-//            boatStatus += "\nEstTimeAtNextMark: " + bytesToLong(Arrays.copyOfRange(payload,31 + (i * 20),37+ (i * 20)));
-//            boatStatus += "\nEstTimeAtFinish: " + bytesToLong(Arrays.copyOfRange(payload,37 + (i * 20),43+ (i * 20)));
-//            boatStatuses.add(boatStatus);
+            Yacht clientBoat = clientStateBoats.get((int) boatStatusSourceID);
+            clientBoat.setBoatStatus((boatStatus));
+            setBoatLegPosition(clientBoat, boatLegNumber);
+            clientBoat.setPenaltiesAwarded(boatPenaltyAwarded);
+            clientBoat.setPenaltiesServed(boatPenaltyServed);
+            clientBoat.setEstimateTimeAtNextMark(estTimeAtNextMark);
+            clientBoat.setEstimateTimeAtFinish(estTimeAtFinish);
         }
-//        if (isRaceStarted()) {
-//            int pos = 1;
-//            for (Yacht yacht : boatsPos.values()) {
-//                yacht.setPosition(String.valueOf(pos));
-//                pos++;
-//            }
-//        } else {
-//            for (Yacht yacht : boatsPos.values()) {
-//                yacht.setPosition("-");
-//            }
-//        }
     }
 
     private static void setBoatLegPosition(Yacht updatingBoat, Integer leg){
@@ -269,7 +261,6 @@ public class ClientPacketParser {
      * @param packet Packet parsed in to use the payload
      */
     private static void extractXmlMessage(StreamPacket packet) {
-
         byte[] payload = packet.getPayload();
 
         int messageType = payload[9];
@@ -291,6 +282,7 @@ public class ClientPacketParser {
         xmlObject.constructXML(doc, messageType);
         if (messageType == 7) {   //7 is the boat XML
             boats = xmlObject.getBoatXML().getCompetingBoats();
+            ClientState.setBoats(xmlObject.getBoatXML().getCompetingBoats());
         }
         if (messageType == 6) { //6 is race info xml
 

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

@@ -1,6 +1,11 @@
 package seng302.client;
 
 import com.sun.org.apache.xpath.internal.operations.Bool;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import seng302.models.Yacht;
 
 /**
  * Created by zyt10 on 21/07/17.
@@ -11,6 +16,9 @@ public class ClientState {
     private static Boolean isHost = false;
     private static Boolean raceStarted = false;
     private static Boolean connectedToHost = false;
+    private static Map<Integer, Yacht> boats = new ConcurrentHashMap<>();
+    private static Boolean dirtyState = true;
+    private static String clientSourceId = "";
 
     public static String getHostIp() {
         return hostIp;
@@ -43,4 +51,28 @@ public class ClientState {
     public static void setConnectedToHost(Boolean connectedToHost) {
         ClientState.connectedToHost = connectedToHost;
     }
+
+    public static Map<Integer, Yacht> getBoats() {
+        return boats;
+    }
+
+    public static Boolean isDirtyState() {
+        return dirtyState;
+    }
+
+    public static void setDirtyState(Boolean dirtyState) {
+        ClientState.dirtyState = dirtyState;
+    }
+
+    public static String getClientSourceId() {
+        return clientSourceId;
+    }
+
+    public static void setClientSourceId(String clientSourceId) {
+        ClientState.clientSourceId = clientSourceId;
+    }
+
+    public static void setBoats(Map<Integer, Yacht> boats) {
+        ClientState.boats = boats;
+    }
 }

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

@@ -32,14 +32,15 @@ public class ClientToServerThread implements Runnable {
     private  ByteArrayOutputStream crcBuffer;
 
     public ClientToServerThread(String ipAddress, Integer portNumber) throws Exception{
-            socket = new Socket(ipAddress, portNumber);
-            is = socket.getInputStream();
-            os = socket.getOutputStream();
+        socket = new Socket(ipAddress, portNumber);
+        is = socket.getInputStream();
+        os = socket.getOutputStream();
 
         Integer allocatedID = threeWayHandshake();
         if (allocatedID != null) {
             ourID = allocatedID;
             clientLog("Successful handshake. Allocated ID: " + ourID, 1);
+            ClientState.setClientSourceId(String.valueOf(ourID));
         } else {
             clientLog("Unsuccessful handhsake", 1);
             closeSocket();
@@ -96,13 +97,17 @@ public class ClientToServerThread implements Runnable {
                     } else {
                         System.err.println("Packet has been dropped");
                     }
+
                 }
+
             } catch (Exception e) {
                 closeSocket();
+                System.out.println("this exception");
                 return;
             }
         }
-
+        closeSocket();
+        System.out.println("[CLIENT] Disconnected from server");
     }