Merge branch 'master' into issue_18_track_alpha

# Conflicts: # racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
2017-08-17 13:00:13 +12:00
parent 62f400b924 96acb6251e
commit 0f58270c10
29 changed files with 536 additions and 322 deletions
@@ -1,7 +1,6 @@
 package visualiser.model;


-import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.paint.Color;
@@ -249,10 +248,10 @@ public class VisualiserRaceState extends RaceState {

            if ((boat.getStatus() == BoatStatusEnum.DNF) || (boat.getStatus() == BoatStatusEnum.PRESTART) || (boat.getCurrentLeg().getLegNumber() < 0)) {

-                boat.setPosition("-");
+                boat.setPlacing("-");

            } else {
-                boat.setPosition(Integer.toString(i + 1));
+                boat.setPlacing(Integer.toString(i + 1));
            }
        }