Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

mock/src/main/java/seng302/Model/Race.java

@@ -111,8 +111,8 @@ public class Race implements Runnable {
         AnimationTimer timer = new AnimationTimer() {
             long currentTime = System.currentTimeMillis();
             long startTime = currentTime + (PRERACE_TIME / scaleFactor);
-            long minutes;
-            long hours;
+            //long minutes;
+            //long hours;
             long timeLeft;
 
             @Override

mock/src/test/java/seng302/Model/BoatTest.java

@@ -93,6 +93,4 @@ public class BoatTest {
         TEST_BOAT.setCurrentLeg(start);
         assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
     }
-
-
 }

visualiser/src/main/java/seng302/Controllers/StartController.java

@@ -40,6 +40,7 @@ public class StartController extends Controller implements Observer {
     @FXML private TableColumn<Boat, String> boatCodeColumn;
     @FXML private Label timeZoneTime;
     @FXML private Label timer;
+    @FXML private Label raceStatusLabel;
     @FXML private int PRERACE_TIME = 10;
 
     //@FXML Button fifteenMinButton;
@@ -48,6 +49,7 @@ public class StartController extends Controller implements Observer {
 
     private StreamedCourse raceData;
     private long timeLeft = 1;
+    private int raceStat;
 
     private VisualiserInput visualiserInput;
 
@@ -108,7 +110,9 @@ public class StartController extends Controller implements Observer {
             @Override
             public void handle(long arg0) {
                 timeLeft = startTime - currentTime;
-                if (visualiserInput.getRaceStatus().getRaceStatus()==2) {
+                raceStat = visualiserInput.getRaceStatus().getRaceStatus();
+                raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus());
+                if (raceStat==2 || raceStat == 3) {
                     updateTime("Race is starting...");
                     stop();
                     parent.beginRace(visualiserInput);

visualiser/src/main/resources/scenes/start.fxml

@@ -50,6 +50,7 @@
                   <Font size="36.0" />
                </font>
             </Label>
+            <Label fx:id="raceStatusLabel" alignment="CENTER" text="Race Status:" textAlignment="CENTER" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
             </children>
         </GridPane>
     </children>