diff --git a/racevisionGame/src/main/java/mock/app/MockOutput.java b/racevisionGame/src/main/java/mock/app/MockOutput.java index 023235cc..198dcc3f 100644 --- a/racevisionGame/src/main/java/mock/app/MockOutput.java +++ b/racevisionGame/src/main/java/mock/app/MockOutput.java @@ -60,7 +60,6 @@ public class MockOutput implements RunnableWithFramePeriod { try { Thread.sleep(500); - } catch (InterruptedException e) { //If we get interrupted, exit the function. Logger.getGlobal().log(Level.WARNING, "MockOutput.run().sleep(waitForXMLs) was interrupted on thread: " + Thread.currentThread(), e); @@ -72,7 +71,6 @@ public class MockOutput implements RunnableWithFramePeriod { } } - long previousFrameTime = System.currentTimeMillis(); diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index a9f11770..05444f6f 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -126,6 +126,7 @@ public class MockRace extends RaceState { this.boats.add(mockBoat); getRaceDataSource().incrementSequenceNumber(); + } /** diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java index b7ccef12..31c9aea0 100644 --- a/racevisionGame/src/main/java/mock/model/RaceServer.java +++ b/racevisionGame/src/main/java/mock/model/RaceServer.java @@ -21,6 +21,8 @@ import java.util.logging.Logger; * Created by connortaylorbrown on 2/08/17. */ public class RaceServer { + private static RaceServer server;//this is for updating xml files as I cannot find an elegant way to do this and since it is near the end of the sprint we shouldn't be doing large scale refactors + private MockRace race; private LatestMessages latestMessages; @@ -47,6 +49,7 @@ public class RaceServer { public RaceServer(MockRace race, LatestMessages latestMessages) { + server = this; this.race = race; this.latestMessages = latestMessages; } @@ -73,6 +76,12 @@ public class RaceServer { } + public static void staticUpdateXML(){ + if (server != null){ + server.updateXMLFiles(); + } + } + /** * Checks if the race/boat/regatta data sources have changed, and if they have, update their xml representations. */ diff --git a/racevisionGame/src/main/java/network/Messages/LatestMessages.java b/racevisionGame/src/main/java/network/Messages/LatestMessages.java index c16d722f..ba6cc45c 100644 --- a/racevisionGame/src/main/java/network/Messages/LatestMessages.java +++ b/racevisionGame/src/main/java/network/Messages/LatestMessages.java @@ -1,5 +1,6 @@ package network.Messages; +import mock.model.RaceServer; import network.Messages.Enums.XMLMessageType; import java.util.*; @@ -152,6 +153,7 @@ public class LatestMessages extends Observable { return false; } else { + RaceServer.staticUpdateXML(); return true; }