Fixed the start screen team list after merging. Team list shows boats competing in event again.

#story[572]

src/main/java/seng302/controllers/Controller.java

@@ -15,7 +15,6 @@ import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
-import seng302.models.Boat;
 import seng302.models.parsers.StreamParser;
 import seng302.models.parsers.XMLParser;
 
@@ -124,18 +123,18 @@ public class Controller implements Initializable {
     }
 
     private void updateTeamList() {
-        ObservableList<Boat> data = FXCollections.observableArrayList();
+        ObservableList<XMLParser.BoatXMLObject.Boat> data = FXCollections.observableArrayList();
         teamList.setItems(data);
         boatNameCol.setCellValueFactory(
-                new PropertyValueFactory<Boat,String>("boatName")
+                new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("BoatName")
         );
         shortNameCol.setCellValueFactory(
-                new PropertyValueFactory<Boat,String>("shortName")
+                new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("ShortName")
         );
         countryCol.setCellValueFactory(
-                new PropertyValueFactory<Boat,String>("country")
+                new PropertyValueFactory<XMLParser.BoatXMLObject.Boat,String>("Country")
         );
-        for (Boat boat : StreamParser.getBoats()) {
+        for (XMLParser.BoatXMLObject.Boat boat : StreamParser.getBoats()) {
             data.add(boat);
         }
     }

src/main/java/seng302/models/parsers/StreamParser.java

@@ -5,7 +5,6 @@ import javafx.geometry.Point3D;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import seng302.models.Boat;
 import seng302.models.parsers.packets.BoatPositionPacket;
 import seng302.models.parsers.packets.StreamPacket;
 
@@ -38,7 +37,7 @@ public class StreamParser extends Thread{
      private static boolean raceFinished = false;
      private static boolean streamStatus = false;
      private static long timeSinceStart = -1;
-     private static List<Boat> boats = new ArrayList<>();
+     private static List<XMLParser.BoatXMLObject.Boat> boats = new ArrayList<>();
      private static double windDirection = 0;
 
     /**
@@ -202,7 +201,8 @@ public class StreamParser extends Thread{
         int raceType = payload[23];
         ArrayList<String> boatStatuses = new ArrayList<>();
         for (int i = 0; i < noBoats; i++){
-            String boatStatus = "SourceID: " + bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
+            Long boatStatusSourceID = bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
+            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)];
@@ -258,6 +258,9 @@ public class StreamParser extends Thread{
         }
 
         xmlObject.constructXML(doc, messageType);
+        if (messageType == 7) {   //7 is the boat XML
+            boats = xmlObject.getBoatXML().getCompetingBoats();
+        }
     }
 
     /**
@@ -477,7 +480,7 @@ public class StreamParser extends Thread{
      *
      * @return list of boats
      */
-    public static List<Boat> getBoats() {
+    public static List<XMLParser.BoatXMLObject.Boat> getBoats() {
         return boats;
     }
 

src/main/java/seng302/models/parsers/XMLParser.java

@@ -6,6 +6,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Class to create an XML object from the XML Packet Messages.
@@ -393,6 +394,8 @@ public class XMLParser {
 
         //Boats
         ArrayList<Boat> boats;
+        //Competing boats
+        List<Boat> competingBoats = new ArrayList<>();
 
         /**
          * Constructor for a BoatXMLObject.
@@ -427,6 +430,9 @@ public class XMLParser {
                 if (currentBoat.getNodeName().equals("Boat")) {
                     Boat boat = new Boat(currentBoat);
                     this.boats.add(boat);
+                    if (boat.getBoatType().equals("Yacht")) {
+                        competingBoats.add(boat);
+                    }
                 }
                 //System.out.println(this.getBoats());
             }
@@ -442,6 +448,9 @@ public class XMLParser {
         public Double getCourseZoneSize() { return courseZoneSize; }
         public ArrayList<Double> getZoneLimits() { return zoneLimits; }
         public ArrayList<Boat> getBoats() { return boats; }
+        public List<Boat> getCompetingBoats() {
+            return competingBoats;
+        }
 
         public class Boat {