fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed thread issue on windows

Browse Source 
- Added a Platform.runLater on the Visualiser loops so that the notifying observers do not try to call it, where it is a non java-fx loop
#story[881]
This commit is contained in:
Fan-Wu Yang
2017-05-14 16:18:11 +12:00
parent 156e0bfdd5
commit a7a065825a
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/VisualiserInput.java
+34 -32
View File
@@ -1,4 +1,5 @@
package seng302; package seng302;
import javafx.application.Platform;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import seng302.Mock.*; import seng302.Mock.*;
import seng302.Networking.BinaryMessageDecoder; import seng302.Networking.BinaryMessageDecoder;
@@ -294,42 +295,43 @@ public class VisualiserInput implements Runnable {
//System.out.println("XML Message!"); //System.out.println("XML Message!");
if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRegatta){ Platform.runLater(()-> {
//System.out.println("Setting Regatta"); if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRegatta) {
try { //System.out.println("Setting Regatta");
course.setRegattaXMLReader(new RegattaXMLReader(xmlMessage.getXmlMessage())); try {
} course.setRegattaXMLReader(new RegattaXMLReader(xmlMessage.getXmlMessage()));
//TODO REFACTOR should put all of these exceptions behind a RegattaXMLReaderException.
catch (IOException | SAXException | ParserConfigurationException e) {
System.err.println("Error creating RegattaXMLReader: " + e.getMessage());
//Continue to the next loop iteration/message.
}
} else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRace){ }
//System.out.println("Setting Course"); //TODO REFACTOR should put all of these exceptions behind a RegattaXMLReaderException.
try { catch (IOException | SAXException | ParserConfigurationException e) {
course.setStreamedCourseXMLReader(new StreamedCourseXMLReader(xmlMessage.getXmlMessage())); System.err.println("Error creating RegattaXMLReader: " + e.getMessage());
} //Continue to the next loop iteration/message.
//TODO REFACTOR should put all of these exceptions behind a StreamedCourseXMLReaderException. }
catch (IOException | SAXException | ParserConfigurationException | StreamedCourseXMLException e) {
System.err.println("Error creating StreamedCourseXMLReader: " + e.getMessage());
//Continue to the next loop iteration/message.
}
} else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeBoat){ } else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRace) {
//System.out.println("Setting Boats"); //System.out.println("Setting Course");
try try {
{ course.setStreamedCourseXMLReader(new StreamedCourseXMLReader(xmlMessage.getXmlMessage()));
course.setBoatXMLReader(new BoatXMLReader(xmlMessage.getXmlMessage())); }
} //TODO REFACTOR should put all of these exceptions behind a StreamedCourseXMLReaderException.
//TODO REFACTOR should put all of these exceptions behind a BoatXMLReaderException. catch (IOException | SAXException | ParserConfigurationException | StreamedCourseXMLException e) {
catch (IOException | SAXException | ParserConfigurationException e) { System.err.println("Error creating StreamedCourseXMLReader: " + e.getMessage());
System.err.println("Error creating BoatXMLReader: " + e.getMessage()); //Continue to the next loop iteration/message.
//Continue to the next loop iteration/message. }
}
} } else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeBoat) {
//System.out.println("Setting Boats");
try {
course.setBoatXMLReader(new BoatXMLReader(xmlMessage.getXmlMessage()));
}
//TODO REFACTOR should put all of these exceptions behind a BoatXMLReaderException.
catch (IOException | SAXException | ParserConfigurationException e) {
System.err.println("Error creating BoatXMLReader: " + e.getMessage());
//Continue to the next loop iteration/message.
}
}
});
} }
//RaceStartStatus. //RaceStartStatus.
else if (message instanceof RaceStartStatus) { else if (message instanceof RaceStartStatus) {