Fixed date time parsing problem

#story[778]

mock/src/main/java/seng302/Data/RaceData.java

@@ -17,7 +17,9 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.io.StringWriter;
-import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
 
 /**
  * Created by esa46 on 21/04/17.
@@ -27,11 +29,11 @@ public class RaceData {
     private RaceDataSource dataSource;
     private Document doc;
     private Element rootElement;
-    private OffsetDateTime creationTimeDate;
+    private ZonedDateTime creationTimeDate;
 
     public RaceData(RaceDataSource dataSource) {
         this.dataSource = dataSource;
-        creationTimeDate = OffsetDateTime.now();
+        creationTimeDate = ZonedDateTime.now();
     }
 
     /**
@@ -109,7 +111,9 @@ public class RaceData {
      */
     private void appendCreationTimeDate() {
         Element creationTimeElement = doc.createElement("CreationTimeDate");
-        creationTimeElement.appendChild(doc.createTextNode(creationTimeDate.toString()));
+
+
+        creationTimeElement.appendChild(doc.createTextNode(toTruncatedString(creationTimeDate)));
         rootElement.appendChild(creationTimeElement);
     }
 
@@ -118,7 +122,7 @@ public class RaceData {
      */
     private void appendRaceStartTime() {
         Element startTimeElement = doc.createElement("RaceStartTime");
-        startTimeElement.setAttribute("Time", (creationTimeDate.plusMinutes(3)).toString());
+        startTimeElement.setAttribute("Time", (toTruncatedString(creationTimeDate.plusMinutes(0))));
         startTimeElement.setAttribute("Postpone", "false");
         rootElement.appendChild(startTimeElement);
     }
@@ -179,7 +183,6 @@ public class RaceData {
      */
     private Element createCompoundMarker(Marker marker, int i) {
         Element compoundMarkElement = doc.createElement("CompoundMark");
-        System.out.println("CompoundMark, " + i);
         compoundMarkElement.setAttribute("CompoundMarkID", i + "");
         compoundMarkElement.setAttribute("Name", marker.getName());
 
@@ -227,5 +230,15 @@ public class RaceData {
         rootElement.appendChild(courseLimitElement);
     }
 
+    private String toTruncatedString(ZonedDateTime time) {
+
+        DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+        dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
+        String text = dateFormat.format(time);
+        System.out.println(text);
+        return text;
+
+
+    }
 
 }

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

@@ -44,7 +44,8 @@ public class MockOutput implements Runnable
 
     public MockOutput() throws  IOException {
         lastHeartbeatTime = System.currentTimeMillis();
-        serverSocket = new ServerSocket(4943);
+        serverSocket = new ServerSocket(4942);
+
     }
     /**
      * calculates the time since last heartbeat
@@ -132,6 +133,7 @@ public class MockOutput implements Runnable
         try {
             while (true){
                 mockSocket = serverSocket.accept();
+
                 outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
 
                 /*******************************Test********************************/

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

@@ -43,7 +43,7 @@ public class Event {
         System.out.println("Sending Boat");
         sendBoatData();
 
-        Race newRace = new Race(raceDataSource, 15, mockOutput);
+        Race newRace = new Race(raceDataSource, 3, mockOutput);
         new Thread((newRace)).start();
     }
 

visualiser/src/main/java/seng302/Controllers/StartController.java

@@ -93,7 +93,8 @@ public class StartController extends Controller implements Observer {
             raceData = new StreamedCourse();
             raceData.addObserver(this);
 //            visualiserInput = new VisualiserInput(new Socket("livedata.americascup.com", 4941), raceData);
-            visualiserInput = new VisualiserInput(new Socket(InetAddress.getLocalHost(), 4943), raceData);
+//            visualiserInput = new VisualiserInput(new Socket("132.181.15.116", 8085), raceData);
+            visualiserInput = new VisualiserInput(new Socket(InetAddress.getLocalHost(), 4942), raceData);
             new Thread(visualiserInput).start();
 //            StreamedCourse streamedCourse = new StreamedCourse(new BoatXMLReader("mockXML/boatXML/boatTest.xml"));
 //            streamedCourse.setStreamedCourseXMLReader(new StreamedCourseXMLReader("mockXML/raceXML/raceTest.xml"));

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

@@ -29,6 +29,8 @@ public class StreamedCourse extends Observable implements RaceDataSource {
         this.boatXMLReader = boatXMLReader;
         if (streamedCourseXMLReader != null && boatXMLReader != null) {
             boatXMLReader.setParticipants(streamedCourseXMLReader.getParticipants());
+            System.out.println("Participant size: " + streamedCourseXMLReader.getParticipants().size());
+
             boatXMLReader.read();
         }
         setChanged();

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

@@ -87,10 +87,10 @@ public class StreamedCourseXMLReader extends XMLReader {
 
         raceID = Integer.parseInt(getTextValueOfNode(settings, "RaceID"));
         raceType = getTextValueOfNode(settings, "RaceType");
-        //creationTimeDate = ZonedDateTime.parse(getTextValueOfNode(settings, "CreationTimeDate"), dateFormat);
 
-//        creationTimeDate = ZonedDateTime.now();
+        creationTimeDate = ZonedDateTime.parse(getTextValueOfNode(settings, "CreationTimeDate"), dateFormat);
-// raceStartTime = ZonedDateTime.now();
+//        System.out.println(getTextValueOfNode(settings, "CreationTimeDate"));
+
         if (raceTimeTag.getNamedItem("Time") != null) raceStartTime = ZonedDateTime.parse(raceTimeTag.getNamedItem("Time").getTextContent(), dateFormat);
         else raceStartTime = ZonedDateTime.parse(raceTimeTag.getNamedItem("Start").getTextContent(), dateFormat);
 

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

@@ -60,15 +60,18 @@ public class StreamedRace extends Race {
     protected void checkPosition(Boat boat, long timeElapsed) {
         StreamedCourse raceData = visualiserInput.getCourse();
         BoatStatusMessage boatStatusMessage = visualiserInput.getBoatStatus().get(boat.getSourceID());
-        BoatStatus boatStatus = BoatStatus.valueOf(boatStatusMessage.getBoatStatus());
+        if (boatStatusMessage != null) {
-        int legNumber = boatStatusMessage.getLegNumber();
+            BoatStatus boatStatus = BoatStatus.valueOf(boatStatusMessage.getBoatStatus());
 
-        if (boatStatus == BoatStatus.DNF) {
+            int legNumber = boatStatusMessage.getLegNumber();
-            boat.setDnf(true);
+
-        } else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) {
+            if (boatStatus == BoatStatus.DNF) {
-            boatsFinished++;
+                boat.setDnf(true);
-            boat.setTimeFinished(timeElapsed);
+            } else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) {
-            boat.setFinished(true);
+                boatsFinished++;
+                boat.setTimeFinished(timeElapsed);
+                boat.setFinished(true);
+            }
         }
         //Update the boat display table in the GUI to reflect the leg change
         updatePositions();

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

@@ -1,6 +1,5 @@
 package seng302.Model;
 
-
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;

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

@@ -214,6 +214,7 @@ public class VisualiserInput implements Runnable
                              } else if (xml.getXmlMsgSubType() == xml.XMLTypeBoat){
                                  System.out.println("Setting Boats");
                                  course.setBoatXMLReader(new BoatXMLReader(xml.getXmlMessage()));
+
                              }
                          } catch (SAXException e) {
                              e.printStackTrace();
@@ -287,7 +288,8 @@ public class VisualiserInput implements Runnable
 
     public static void main(String argv[]) throws Exception
     {
-        Socket socket = new Socket(InetAddress.getLocalHost(), 4943);
+        Socket socket = new Socket("livedata.americascup.com", 4941);
+//        Socket socket = new Socket(InetAddress.getLocalHost(), 4942);
         VisualiserInput receiver = new VisualiserInput(socket, new StreamedCourse());
         receiver.run();
     }