Merged Mock49 and fixed bugs

- Error where mock would not read in the files when running from the jar.
- Error where the AC35 stream now no longer sends us packets with information that is set for 0 for boat location.
#story[881] #pair[fwy13, esa46

mock/src/main/java/seng302/App.java

@@ -4,12 +4,25 @@ package seng302;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import seng302.DataInput.XMLReader;
 import seng302.Model.Event;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class App extends Application {
@@ -27,21 +40,35 @@ public class App extends Application {
     public void start(Stage primaryStage) {
         try {
 
-            String regattaXML = readFile("mock/src/main/resources/mockXML/regattaTest.xml", StandardCharsets.UTF_8);
-            String raceXML = readFile("mock/src/main/resources/mockXML/raceTest.xml", StandardCharsets.UTF_8);
-            String boatXML = readFile("mock/src/main/resources/mockXML/boatTest.xml", StandardCharsets.UTF_8);
+            String regattaXML = readFile("mockXML/regattaTest.xml", StandardCharsets.UTF_8);
+            String raceXML = readFile("mockXML/raceTest.xml", StandardCharsets.UTF_8);
+            String boatXML = readFile("mockXML/boatTest.xml", StandardCharsets.UTF_8);
 
             Event raceEvent = new Event(raceXML, regattaXML, boatXML);
             raceEvent.start();
 
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+        } catch (SAXException e) {
+            e.printStackTrace();
+        } catch (TransformerException e) {
+            e.printStackTrace();
         }
     }
 
-    static String readFile(String path, Charset encoding) throws IOException {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
+    private String readFile(String path, Charset encoding) throws IOException, ParserConfigurationException, SAXException, TransformerException {
+
+        InputSource fXmlFile = new InputSource(getClass().getClassLoader().getResourceAsStream(path));
+
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        Document doc = dBuilder.parse(fXmlFile);
+        doc.getDocumentElement().normalize();
+
+        return XMLReader.getContents(doc);
+
     }
 
 }

mock/src/main/java/seng302/DataInput/XMLReader.java

@@ -9,9 +9,13 @@ import org.xml.sax.SAXException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
+import java.io.StringWriter;
 
 /**
  * Created by fwy13 on 26/03/2017.
@@ -80,4 +84,19 @@ public abstract class XMLReader {
         return node.getAttributes().getNamedItem(attribute) != null;
     }
 
+    public static String getContents(Document document) throws TransformerException {
+        DOMSource source = new DOMSource(document);
+
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        Transformer transformer = transformerFactory.newTransformer();
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+
+        StringWriter stringWriter = new StringWriter();
+        StreamResult result = new StreamResult(stringWriter);
+        transformer.transform(source, result);
+
+        return stringWriter.toString();
+    }
+
 }

mock/src/main/java/seng302/Model/Race.java

@@ -226,7 +226,6 @@ public class Race implements Runnable {
         //distanceTravelled = velocity (nm p hr) * time taken to update loop
         double distanceTravelled = (boat.getScaledVelocity() * millisecondsElapsed) / 3600000;
         double totalDistanceTravelled = distanceTravelled + boat.getDistanceTravelledInLeg();
-        System.out.println(totalDistanceTravelled);
 
         boolean finish = boat.getCurrentLeg().getName().equals("Finish");
         if (!finish) {