Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake

# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/Wake.java
#	src/main/java/seng302/models/parsers/StreamParser.java
#	src/main/resources/views/MainView.fxml

src/main/java/seng302/models/Boat.java

@@ -21,6 +21,10 @@ public class Boat {
     private int markLastPast;
     private String shortName;
     private int id;
+    // new attributes to boat
+    private int sourceID;
+    private String boatName;
+    private String country;
 
     public Boat(String teamName) {
         this.teamName = teamName;
@@ -45,6 +49,21 @@ public class Boat {
         this.id = id;
     }
 
+    /**
+     * New instance created by BoatsParser.
+     *
+     * @param sourceID  source ID of the boat
+     * @param boatName  full name of the boat
+     * @param shortName short name of the boat
+     * @param country   country of the boat
+     */
+    public Boat(int sourceID, String boatName, String shortName, String country) {
+        this.sourceID = sourceID;
+        this.boatName = boatName;
+        this.shortName = shortName;
+        this.country = country;
+    }
+
     /**
      * Returns the name of the team sailing the boat
      *
@@ -141,4 +160,15 @@ public class Boat {
         return id;
     }
 
+    public int getSourceID() {
+        return sourceID;
+    }
+
+    public String getBoatName() {
+        return boatName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
 }

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

@@ -0,0 +1,77 @@
+package seng302.models.parsers;
+
+import org.w3c.dom.*;
+import org.xml.sax.InputSource;
+import seng302.models.Boat;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+/**
+ * Created by ryan_ on 30/04/2017.
+ */
+public class BoatsParser extends FileParser {
+    private Document doc;
+
+    public BoatsParser(String xmlString) {
+        this.doc = this.parseFile(xmlString);
+    }
+
+    /**
+     * Create a boat instance from a given node if 'Type' is 'Yacht'
+     *
+     * @param node a boat node
+     * @return an instance of Boat
+     */
+    private Boat parseBoat(Node node) {
+        try {
+            if (node.getNodeType() == Node.ELEMENT_NODE) {
+                Element element = (Element) node;
+                if (element.getAttribute("Type").equals("Yacht")) {
+                    String sourceID = element.getAttribute("SourceID");
+                    String boatName = element.getAttribute("BoatName");
+                    String shortName = element.getAttribute("ShortName");
+                    String stoweName = element.getAttribute("StoweName");
+                    String country = element.getAttribute("Country");
+                    Boat boat = new Boat(Integer.parseInt(sourceID), boatName, shortName, country);
+                    return boat;
+                }
+            } else {
+                throw new NoSuchElementException("Cannot generate a boat by given node");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Returns a list of boats from the xml.
+     *
+     * @return a list of boats
+     */
+    public List<Boat> getBoats() {
+        ArrayList<Boat> boats = new ArrayList<>();
+
+        try {
+            NodeList nodes = this.doc.getElementsByTagName("Boat");
+            for (int i = 0; i < nodes.getLength(); i++) {
+                Node node = nodes.item(i);
+                Boat boat = parseBoat(node);
+                if (!(boat == null)) {
+                    boats.add(boat);
+                }
+            }
+            return boats;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -1,12 +1,14 @@
 package seng302.models.parsers;
 
 import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
 
 /**
  * Created by Haoming Yin (hyi25) on 16/3/2017
@@ -15,6 +17,8 @@ public abstract class FileParser {
 
     private String filePath;
 
+    public FileParser() {}
+
     public FileParser(String path) {
         this.filePath = path;
     }
@@ -32,6 +36,19 @@ public abstract class FileParser {
             e.printStackTrace();
             return null;
         }
+    }
 
+    protected Document parseFile(String xmlString) {
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new InputSource(new StringReader(xmlString)));
+            // optional, in order to recover info from broken line.
+            doc.getDocumentElement().normalize();
+            return doc;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 }

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

@@ -5,6 +5,7 @@ import javafx.geometry.Point3D;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import seng302.models.Boat;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -32,6 +33,10 @@ public class StreamParser extends Thread{
      private String threadName;
      private Thread t;
      private static boolean raceStarted = false;
+     private static boolean raceFinished = false;
+     private static boolean streamStatus = false;
+     private static long timeSinceStart = -1;
+     private static List<Boat> boats = new ArrayList<>();
 
      public StreamParser(String threadName){
         this.threadName = threadName;
@@ -44,6 +49,7 @@ public class StreamParser extends Thread{
     public void run(){
          try {
              System.out.println("START OF STREAM");
+             streamStatus = true;
              while (StreamReceiver.packetBuffer == null || StreamReceiver.packetBuffer.size() < 1) {
                  Thread.sleep(1);
              }
@@ -155,16 +161,21 @@ public class StreamParser extends Thread{
         format.setTimeZone(TimeZone.getTimeZone("UTC"));
         long timeTillStart = ((new Date (expectedStartTime)).getTime() - (new Date (currentTime)).getTime())/1000;
         if (timeTillStart > 0 && timeTillStart % 10 == 0) {
+            timeSinceStart = timeTillStart;
             System.out.println("Time till start: " + timeTillStart + " Seconds");
         } else {
             if (raceStatus == 4 || raceStatus == 8){
+                raceFinished = true;
+                raceStarted = false;
                 System.out.println("RACE HAS FINISHED");
             } else if (!raceStarted){
                 raceStarted = true;
+                raceFinished = false;
                 System.out.println("RACE HAS STARTED");
             }
             if (timeTillStart % 10 == 0){
                 System.out.println("Time since start: " + -1 * timeTillStart + " Seconds");
+                timeSinceStart = timeTillStart;
             }
         }
         long windDir = bytesToLong(Arrays.copyOfRange(payload,18,20));
@@ -226,17 +237,24 @@ public class StreamParser extends Thread{
         while (payloadStream.available() > 0 && (currentChar = payloadStream.read()) != 0) {
             xmlMessage += (char)currentChar;
         }
-        //Create XML document Object
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = null;
-        Document doc = null;
-        try {
-            db = dbf.newDocumentBuilder();
-            doc = db.parse(new InputSource(new StringReader(xmlMessage)));
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            e.printStackTrace();
+
+        // Parse boat xml from server
+        if (xmlMessageSubType == 7) {
+            BoatsParser boatsParser = new BoatsParser(xmlMessage);
+            boats = boatsParser.getBoats();
         }
-        // TODO: 30/04/2017 (ajm412) Figure out how this will tie into the backend of the visualiser now that the parsing is done.
+
+        //Create XML document Object
+//        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+//        DocumentBuilder db = null;
+//        try {
+//            db = dbf.newDocumentBuilder();
+//            Document doc = db.parse(new InputSource(new StringReader(xmlMessage)));
+//            // TODO: 25/04/17 ajm412: Check that the object matches expected structure and return Document object.
+//        } catch (ParserConfigurationException | IOException | SAXException e) {
+//            e.printStackTrace();
+//        }
+
     }
 
     /**
@@ -410,5 +428,50 @@ public class StreamParser extends Thread{
         }
         return partialLong;
     }
+
+    /**
+     * returns false if race not started, true otherwise
+     *
+     * @return race started status
+     */
+    public static boolean isRaceStarted() {
+        return raceStarted;
+    }
+
+    /**
+     * returns false if stream not connected, true otherwise
+     *
+     * @return stream started status
+     */
+    public static boolean isStreamStatus() {
+        return streamStatus;
+    }
+
+    /**
+     * returns race timer
+     *
+     * @return race timer in long
+     */
+    public static long getTimeSinceStart() {
+        return timeSinceStart;
+    }
+
+    /**
+     * return false if race not finished, true otherwise
+     *
+     * @return race finished status
+     */
+    public static boolean isRaceFinished() {
+        return raceFinished;
+    }
+
+    /**
+     * return list of boats from the server
+     *
+     * @return list of boats
+     */
+    public static List<Boat> getBoats() {
+        return boats;
+    }
 }