michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into Story64_SailsAnimations

Browse Source 
# Conflicts:
#	src/main/java/seng302/model/Yacht.java
This commit is contained in:
Kusal Ekanayake
2017-08-13 15:27:25 +12:00
parent 25c2de63a2 fda233f5ad
commit 0a7a9018f3
9 changed files with 224 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/server/simulator/parsers/CourseParser.java
+7 -7
View File
@@ -8,10 +8,10 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import seng302.model.mark.CompoundMark;
import seng302.gameServer.server.simulator.Corner;
import seng302.model.mark.Mark;
import seng302.gameServer.server.simulator.RoundingType;
import seng302.model.mark.CompoundMark;
import seng302.model.mark.Mark;
/**
* Parses the race xml file to get course details
@@ -84,17 +84,17 @@ public class CourseParser extends FileParser {
NodeList marks = e.getElementsByTagName("Mark");
List<Mark> subMarks = new ArrayList<>();
for (int i = 0; i < marks.getLength(); i++) {
Mark mark = getMark(marks.item(i));
Mark mark = getMark(marks.item(i));
if (mark != null) {
subMarks.add(mark);
}
}
}
return new CompoundMark(markID, name, subMarks);
}
System.out.println("Failed to create compound mark.");
return null;
}
System.out.println("Failed to create compound mark.");
return null;
}
private Mark getMark(Node node) {