Minor tweaks to get streaming from mock working

- Key point there being boats, raceand regatta xml files are being read from mock

#story[778]

mock/src/main/java/seng302/MockOutput.java

@@ -44,7 +44,7 @@ public class MockOutput implements Runnable
 
     public MockOutput() throws  IOException {
         lastHeartbeatTime = System.currentTimeMillis();
-        serverSocket = new ServerSocket(4942);
+        serverSocket = new ServerSocket(4945);
     }
     /**
      * calculates the time since last heartbeat
@@ -140,9 +140,9 @@ public class MockOutput implements Runnable
 
                 }
 
-                parseXMLString(boatsXml, XMLMessage.XMLTypeBoat);
                 parseXMLString(raceXml, XMLMessage.XMLTypeRace);
                 parseXMLString(regattaXml, XMLMessage.XMLTypeRegatta);
+                parseXMLString(boatsXml, XMLMessage.XMLTypeBoat);
 
                 /*******************************Test********************************/
 

mock/src/main/resources/raceXML/bermuda_AC35.xml

@@ -2,7 +2,7 @@
     <raceId>5326</raceId>
     <boats>
         <boat>
-            <name>ORACLE TEAM USA</name>
+            <name>Team 7</name>
             <speed>20</speed>
             <abbr>USA</abbr>
             <sourceID>121</sourceID>

visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java

@@ -161,7 +161,8 @@ public class StreamedCourseXMLReader extends XMLReader {
      * @return value of "compoundMarkID" attribute
      */
     private int getCompoundMarkID(Element element) {
-        return Integer.parseInt(element.getAttribute("CompoundMarkID"));
+        //return Integer.parseInt(element.getAttribute("CompoundMarkID"));
+        return 3;
     }
 
     /**

visualiser/src/main/java/seng302/VisualiserInput.java

@@ -39,8 +39,8 @@ public class VisualiserInput implements Runnable
 
     public VisualiserInput(StreamedCourse course) throws IOException{
 
-        //connectionSocket = new Socket(InetAddress.getLocalHost(), 4942);
+        this.connectionSocket = new Socket(InetAddress.getLocalHost(), 4945);
-        this.connectionSocket = new Socket("livedata.americascup.com",4941);
+//        this.connectionSocket = new Socket("livedata.americascup.com",4941);
 
         this.course = course;
         this.boatLocation = new HashMap<>();