From b80805656735b6b8119e53bd965694cab1053972 Mon Sep 17 00:00:00 2001 From: Jessica Syder Date: Tue, 12 Sep 2017 16:39:19 +1200 Subject: [PATCH] Host boat isnt disappearing anymore (I think). #story[1261] --- .../src/main/java/mock/model/RaceServer.java | 8 +++++++ .../java/network/Messages/LatestMessages.java | 24 ++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/RaceServer.java b/racevisionGame/src/main/java/mock/model/RaceServer.java index b7ccef12..c9575ce3 100644 --- a/racevisionGame/src/main/java/mock/model/RaceServer.java +++ b/racevisionGame/src/main/java/mock/model/RaceServer.java @@ -23,6 +23,7 @@ import java.util.logging.Logger; public class RaceServer { private MockRace race; private LatestMessages latestMessages; + private static RaceServer server; /** @@ -47,10 +48,17 @@ 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. */ diff --git a/racevisionGame/src/main/java/network/Messages/LatestMessages.java b/racevisionGame/src/main/java/network/Messages/LatestMessages.java index c16d722f..86f02d91 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.*; @@ -33,9 +34,6 @@ public class LatestMessages extends Observable { private XMLMessage regattaXMLMessage; - - - /** * Ctor. */ @@ -45,6 +43,7 @@ public class LatestMessages extends Observable { /** * Returns a copy of the race snapshot. + * * @return Copy of the race snapshot. */ public List getSnapshot() { @@ -54,6 +53,7 @@ public class LatestMessages extends Observable { /** * Sets the snapshot of the race. + * * @param snapshot New snapshot of race. */ public void setSnapshot(List snapshot) { @@ -61,12 +61,9 @@ public class LatestMessages extends Observable { } - - - - /** * Returns the latest race xml message. + * * @return The latest race xml message. */ public XMLMessage getRaceXMLMessage() { @@ -75,6 +72,7 @@ public class LatestMessages extends Observable { /** * Sets the latest race xml message to a specified race XML message. + * * @param raceXMLMessage The new race XML message to use. */ public void setRaceXMLMessage(XMLMessage raceXMLMessage) { @@ -87,6 +85,7 @@ public class LatestMessages extends Observable { /** * Returns the latest boat xml message. + * * @return The latest boat xml message. */ public XMLMessage getBoatXMLMessage() { @@ -95,6 +94,7 @@ public class LatestMessages extends Observable { /** * Sets the latest boat xml message to a specified boat XML message. + * * @param boatXMLMessage The new boat XML message to use. */ public void setBoatXMLMessage(XMLMessage boatXMLMessage) { @@ -107,6 +107,7 @@ public class LatestMessages extends Observable { /** * Returns the latest regatta xml message. + * * @return The latest regatta xml message. */ public XMLMessage getRegattaXMLMessage() { @@ -115,6 +116,7 @@ public class LatestMessages extends Observable { /** * Sets the latest regatta xml message to a specified regatta XML message. + * * @param regattaXMLMessage The new regatta XML message to use. */ public void setRegattaXMLMessage(XMLMessage regattaXMLMessage) { @@ -126,6 +128,7 @@ public class LatestMessages extends Observable { /** * Checks the type of xml message, and places it in this LatestMessages object. + * * @param xmlMessage The new xml message to use. */ public void setXMLMessage(XMLMessage xmlMessage) { @@ -145,17 +148,20 @@ public class LatestMessages extends Observable { /** * Returns whether or not there is an xml message for each message type. + * * @return True if race, boat, and regatta have an xml message, false otherwise. */ public boolean hasAllXMLMessages() { - if (this.regattaXMLMessage == null || this.boatXMLMessage == null || this.raceXMLMessage == null) { + if (this.regattaXMLMessage == null || this.boatXMLMessage == null || + this.raceXMLMessage == null) { return false; } else { + RaceServer.staticUpdateXML(); return true; } } -} +} \ No newline at end of file