Got mock data being used by visualiser.

- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished

#story[778]
This commit is contained in:
Erika Savell
2017-05-01 20:56:46 +12:00
parent d1baf021ac
commit 7d1f4209e4
6 changed files with 14 additions and 15 deletions
@@ -92,7 +92,8 @@ public class StartController extends Controller implements Observer {
try {
raceData = new StreamedCourse();
raceData.addObserver(this);
visualiserInput = new VisualiserInput(new Socket("livedata.americascup.com", 4941), raceData);
// visualiserInput = new VisualiserInput(new Socket("livedata.americascup.com", 4941), raceData);
visualiserInput = new VisualiserInput(new Socket(InetAddress.getLocalHost(), 4943), raceData);
new Thread(visualiserInput).start();
// StreamedCourse streamedCourse = new StreamedCourse(new BoatXMLReader("mockXML/boatXML/boatTest.xml"));
// streamedCourse.setStreamedCourseXMLReader(new StreamedCourseXMLReader("mockXML/raceXML/raceTest.xml"));
@@ -87,10 +87,13 @@ public class StreamedCourseXMLReader extends XMLReader {
raceID = Integer.parseInt(getTextValueOfNode(settings, "RaceID"));
raceType = getTextValueOfNode(settings, "RaceType");
creationTimeDate = ZonedDateTime.parse(getTextValueOfNode(settings, "CreationTimeDate"), dateFormat);
//creationTimeDate = ZonedDateTime.parse(getTextValueOfNode(settings, "CreationTimeDate"), dateFormat);
// creationTimeDate = ZonedDateTime.now();
// raceStartTime = ZonedDateTime.now();
if (raceTimeTag.getNamedItem("Time") != null) raceStartTime = ZonedDateTime.parse(raceTimeTag.getNamedItem("Time").getTextContent(), dateFormat);
else raceStartTime = ZonedDateTime.parse(raceTimeTag.getNamedItem("Start").getTextContent(), dateFormat);
postpone = Boolean.parseBoolean(raceTimeTag.getNamedItem("Postpone").getTextContent());
}
@@ -69,8 +69,6 @@ public class StreamedRace extends Race {
boatsFinished++;
boat.setTimeFinished(timeElapsed);
boat.setFinished(true);
} else {
boat.setCurrentLeg(raceData.getLegs().get(legNumber));
}
//Update the boat display table in the GUI to reflect the leg change
updatePositions();
@@ -287,7 +287,7 @@ public class VisualiserInput implements Runnable
public static void main(String argv[]) throws Exception
{
Socket socket = new Socket(InetAddress.getLocalHost(), 4942);
Socket socket = new Socket(InetAddress.getLocalHost(), 4943);
VisualiserInput receiver = new VisualiserInput(socket, new StreamedCourse());
receiver.run();
}