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

Boat table and positions now update. #story[782]

Browse Source
This commit is contained in:
Joseph Gardner
2017-05-04 12:10:13 +12:00
parent eb58581e83
commit e43353c322
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Mock/StreamedRace.java
+8
View File
@@ -58,6 +58,14 @@ public class StreamedRace extends Race {
int legNumber = boatStatusMessage.getLegNumber(); int legNumber = boatStatusMessage.getLegNumber();
if (legNumber == 0) {
boat.setCurrentLeg(new Leg("Prestart", -1));
}
if (legNumber >= 1 && legNumber < legs.size()) {
boat.setCurrentLeg(legs.get(legNumber));
}
if (boatStatus == BoatStatus.DNF) { if (boatStatus == BoatStatus.DNF) {
boat.setDnf(true); boat.setDnf(true);
} else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) { } else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) {
visualiser/src/main/java/seng302/Model/Race.java
+1 -1
View File
@@ -247,7 +247,7 @@ public abstract class Race implements Runnable {
for(Boat boat: startingBoats) { for(Boat boat: startingBoats) {
if(boat != null) { if(boat != null) {
boat.setPosition(Integer.toString(startingBoats.indexOf(boat) + 1)); boat.setPosition(Integer.toString(startingBoats.indexOf(boat) + 1));
if (boat.getCurrentLeg().getName().equals("DNF") || boat.getCurrentLeg().getLegNumber() == 0) if (boat.isDnf() || !boat.isStarted() || boat.getCurrentLeg().getLegNumber() < 0)
boat.setPosition("-"); boat.setPosition("-");
} }
} }