From 7e8c3af9ce832e2225265fc7c5c18f6f6dc9f01c Mon Sep 17 00:00:00 2001
From: Michael Rausch <michael@michaelrausch.net>
Date: Thu, 4 May 2017 01:08:18 +1200
Subject: [PATCH] Removed extra 'minutes' labels

---
 src/main/java/seng302/App.java                            | 5 +++++
 src/main/java/seng302/controllers/RaceViewController.java | 6 +++---
 src/main/java/seng302/models/Race.java                    | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 38ed85eb..742b6032 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -1,6 +1,7 @@
 package seng302;
 
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -19,6 +20,10 @@ public class App extends Application
         primaryStage.setMaximized(true);
 
         primaryStage.show();
+        primaryStage.setOnCloseRequest(e -> {
+            Platform.exit();
+        });
+
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 6112be11..940779d5 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -305,21 +305,21 @@ public class RaceViewController extends Thread{
     }
 
     private String currentTimer() {
-        String timerString = "0:00 minutes";
+        String timerString = "0:00";
         if (StreamParser.getTimeSinceStart() > 0) {
             String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
             String timerSecond = Long.toString(StreamParser.getTimeSinceStart() % 60);
             if (timerSecond.length() == 1) {
                 timerSecond = "0" + timerSecond;
             }
-            timerString = "-" + timerMinute + ":" + timerSecond + " minutes";
+            timerString = "-" + timerMinute + ":" + timerSecond;
         } else {
             String timerMinute = Long.toString(-1 * StreamParser.getTimeSinceStart() / 60);
             String timerSecond = Long.toString(-1 * StreamParser.getTimeSinceStart() % 60);
             if (timerSecond.length() == 1) {
                 timerSecond = "0" + timerSecond;
             }
-            timerString = timerMinute + ":" + timerSecond + " minutes";
+            timerString = timerMinute + ":" + timerSecond;
         }
         return timerString;
     }
diff --git a/src/main/java/seng302/models/Race.java b/src/main/java/seng302/models/Race.java
index fc7ae0ef..67988cf5 100644
--- a/src/main/java/seng302/models/Race.java
+++ b/src/main/java/seng302/models/Race.java
@@ -102,8 +102,8 @@ public class Race {
                         events.put(boat, new ArrayList<>(Arrays.asList(event)));
                     }
                     totalDistance += event.getDistanceBetweenMarks();
-                    System.out.println(totalDistance);
-                    System.out.println(boat.getVelocity());
+                    //System.out.println(totalDistance);
+                    //System.out.println(boat.getVelocity());
                 }
 
                 // There are no more marks after this event