Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer

racevisionGame/src/main/java/mock/model/RaceServer.java

@@ -24,7 +24,6 @@ import java.util.logging.Logger;
 public class RaceServer {
     private MockRace race;
     private LatestMessages latestMessages;
-    private static RaceServer server;
     private List<YachtEvent> collisionEvents = new ArrayList<>();
 
 
@@ -50,16 +49,10 @@ public class RaceServer {
 
 
     public RaceServer(MockRace race, LatestMessages latestMessages) {
-        server = this;
         this.race = race;
         this.latestMessages = latestMessages;
     }
 
-    public static void staticUpdateXML() {
-        if (server != null) {
-            server.updateXMLFiles();
-        }
-    }
 
     /**
      * Parses the race to create a snapshot, and places it in latestMessages.

racevisionGame/src/main/java/network/Messages/LatestMessages.java

@@ -157,7 +157,6 @@ public class LatestMessages extends Observable {
             return false;
 
         } else {
-            RaceServer.staticUpdateXML();
             return true;
 
         }

racevisionGame/src/main/java/shared/dataInput/BoatXMLReader.java

@@ -183,6 +183,10 @@ public class BoatXMLReader extends XMLReader implements BoatDataSource {
         return sequenceNumber;
     }
 
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
     @Override
     public void incrementSequenceNumber() {
         sequenceNumber++;

racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java

@@ -499,6 +499,10 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource {
         return sequenceNumber;
     }
 
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
     @Override
     public void incrementSequenceNumber() {
         sequenceNumber++;

racevisionGame/src/main/java/shared/dataInput/RegattaXMLReader.java

@@ -217,6 +217,10 @@ public class RegattaXMLReader extends XMLReader implements RegattaDataSource {
         return sequenceNumber;
     }
 
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
     @Override
     public void incrementSequenceNumber() {
         sequenceNumber++;

racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatsXMLMessageCommand.java

@@ -41,8 +41,8 @@ public class BoatsXMLMessageCommand implements Command {
 
     @Override
     public void execute() {
-
+        if (boatDataSource.getSequenceNumber() > visualiserRace.getBoatDataSource().getSequenceNumber()) {
-        visualiserRace.setBoatDataSource(boatDataSource);
+            visualiserRace.setBoatDataSource(boatDataSource);
-
+        }
     }
 }

racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RaceXMLMessageCommand.java

@@ -38,7 +38,9 @@ public class RaceXMLMessageCommand implements Command {
     @Override
     public void execute() {
 
-        visualiserRace.setRaceDataSource(raceDataSource);
+        if (raceDataSource.getSequenceNumber() > visualiserRace.getRaceDataSource().getSequenceNumber()) {
+            visualiserRace.setRaceDataSource(raceDataSource);
+        }
 
     }
 }

racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/RegattaXMLMessageCommand.java

@@ -37,8 +37,9 @@ public class RegattaXMLMessageCommand implements Command {
 
     @Override
     public void execute() {
-
+        if (regattaDataSource.getSequenceNumber() > visualiserRace.getRegattaDataSource().getSequenceNumber()) {
-        visualiserRace.setRegattaDataSource(regattaDataSource);
+            visualiserRace.setRegattaDataSource(regattaDataSource);
+        }
 
     }
 }

racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/XMLMessageCommandFactory.java

@@ -34,17 +34,20 @@ public class XMLMessageCommandFactory {
             switch (message.getXmlMsgSubType()) {
 
                 case BOAT:
-                    BoatDataSource boatDataSource = new BoatXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    BoatXMLReader boatDataSource = new BoatXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    boatDataSource.setSequenceNumber(message.getSequenceNumber());
                     return new BoatsXMLMessageCommand(boatDataSource, visualiserRace);
 
 
                 case RACE:
-                    RaceDataSource raceDataSource = new RaceXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    RaceXMLReader raceDataSource = new RaceXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    raceDataSource.setSequenceNumber(message.getSequenceNumber());
                     return new RaceXMLMessageCommand(raceDataSource, visualiserRace);
 
 
                 case REGATTA:
-                    RegattaDataSource regattaDataSource = new RegattaXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    RegattaXMLReader regattaDataSource = new RegattaXMLReader(message.getXmlMessage(), XMLFileType.Contents);
+                    regattaDataSource.setSequenceNumber(message.getSequenceNumber());
                     return new RegattaXMLMessageCommand(regattaDataSource, visualiserRace);
 
 

racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java

@@ -429,12 +429,14 @@ public class RaceViewController extends Controller {
             @Override
             public void handle(long now) {
                 CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
-                Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
+                if (target != null) {
+                    Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
 
-                nextMarkArrow.setX(view3D.getPivot().getX());
+                    nextMarkArrow.setX(view3D.getPivot().getX());
-                nextMarkArrow.setY(view3D.getPivot().getY());
+                    nextMarkArrow.setY(view3D.getPivot().getY());
-                nextMarkArrow.setZ(view3D.getPivot().getZ() + 15);
+                    nextMarkArrow.setZ(view3D.getPivot().getZ() + 15);
-                nextMarkArrow.setHeading(headingToMark.degrees());
+                    nextMarkArrow.setHeading(headingToMark.degrees());
+                }
             }
         };
         arrowToNextMark.start();