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

Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]

Browse Source
This commit is contained in:
Joseph Gardner
2017-05-01 14:15:34 +12:00
parent 7e569b59b7
commit 10dd066302
7 changed files with 552 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
+5 -14
View File
@@ -30,7 +30,7 @@ public class BoatXMLReader extends XMLReader {
* @throws ParserConfigurationException error
*/
public BoatXMLReader(String filePath) throws IOException, SAXException, ParserConfigurationException, ParseException {
this(filePath, false);
this(filePath, true);
}
/**
@@ -89,19 +89,14 @@ public class BoatXMLReader extends XMLReader {
/**
* Reads the information about one boat
* Ignored values: ShapeID, StoweName, HullNum, Skipper
* Ignored values: ShapeID, StoweName, HullNum, Skipper, Type
*/
private void readSingleBoat(Node boat) {
StreamedBoat streamedBoat;
String type = "None";
int sourceID = -1;
String boatName = null;
String shortName = null;
String country = null;
if (exists(boat, "Type")) type = boat.getAttributes().getNamedItem("Type").getTextContent();
if (exists(boat, "SourceID")) sourceID = Integer.parseInt(boat.getAttributes().getNamedItem("SourceID").getTextContent());
if (exists(boat, "BoatName")) boatName = boat.getAttributes().getNamedItem("BoatName").getTextContent();
if (exists(boat, "ShortName")) shortName = boat.getAttributes().getNamedItem("ShortName").getTextContent();
int sourceID = Integer.parseInt(boat.getAttributes().getNamedItem("SourceID").getTextContent());
String boatName = boat.getAttributes().getNamedItem("BoatName").getTextContent();
String shortName = boat.getAttributes().getNamedItem("ShortName").getTextContent();
if (exists(boat, "Country")) country = boat.getAttributes().getNamedItem("Country").getTextContent();
// Ignore all non participating boats
@@ -137,10 +132,6 @@ public class BoatXMLReader extends XMLReader {
this.participants = participants;
}
public Map<Integer, StreamedBoat> getStreamedBoatMap() {
return streamedBoatMap;
}
public List<Boat> getBoats() {
return new ArrayList<>(streamedBoatMap.values());
}
visualiser/src/main/java/seng302/Mock/StreamedBoat.java
+4
View File
@@ -45,4 +45,8 @@ public class StreamedBoat extends Boat {
}
return azimuth;
}
public int getSourceID() {
return sourceID;
}
}