From 3adadcc1e137d195415dd8a220cfa81c356b1641 Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 1 May 2017 18:49:58 +1200
Subject: [PATCH] Updated the timer to show two decimals for the seconds.

 #story[572]
---
 src/main/java/seng302/App.java                 |  4 ++--
 .../java/seng302/controllers/Controller.java   | 18 ++++++++++++------
 .../controllers/RaceViewController.java        | 14 ++++++++++----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index c86ef5d1..bd4de5ef 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -34,8 +34,8 @@ public class App extends Application
             sr = new StreamReceiver("localhost", 8085, "RaceStream");
         }
         else{
-//              sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+              sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
 //            sr = new StreamReceiver("localhost", 8085, "RaceStream");
         }
 
diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index ec54cd88..2baa46c4 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -69,7 +69,7 @@ public class Controller implements Initializable {
     }
 
     /**
-     * Running a timer to update the livestream status on welcome screen. Update interval is 500 miliseconds.
+     * Running a timer to update the livestream status on welcome screen. Update interval is 1 second.
      */
     public void startStream() {
         if (StreamParser.isStreamStatus()) {
@@ -91,22 +91,28 @@ public class Controller implements Initializable {
                             updateTeamList();
                             timeTillLive.setTextFill(Color.RED);
                             switchToRaceViewButton.setDisable(false);
-                            Long timerMinute = StreamParser.getTimeSinceStart() / 60;
-                            Long timerSecond = StreamParser.getTimeSinceStart() % 60;
+                            String timerMinute = Long.toString(StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long.toString(StreamParser.getTimeSinceStart() % 60);
+                            if (timerSecond.length() == 1) {
+                                timerSecond = "0" + timerSecond;
+                            }
                             String timerString = "-" + timerMinute + ":" + timerSecond + " minutes";
                             timeTillLive.setText(timerString);
                         } else {
                             updateTeamList();
                             timeTillLive.setTextFill(Color.BLACK);
                             switchToRaceViewButton.setDisable(false);
-                            Long timerMinute = -1 * StreamParser.getTimeSinceStart() / 60;
-                            Long timerSecond = -1 * StreamParser.getTimeSinceStart() % 60;
+                            String timerMinute = Long.toString(-1 * StreamParser.getTimeSinceStart() / 60);
+                            String timerSecond = Long.toString(-1 * StreamParser.getTimeSinceStart() % 60);
+                            if (timerSecond.length() == 1) {
+                                timerSecond = "0" + timerSecond;
+                            }
                             String timerString = timerMinute + ":" + timerSecond + " minutes";
                             timeTillLive.setText(timerString);
                         }
                     });
                 }
-            }, 0, 500);
+            }, 0, 1000);
         } else {
             timeTillLive.setText("Stream not available.");
             timeTillLive.setTextFill(Color.RED);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 4e661481..8468376d 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -294,12 +294,18 @@ public class RaceViewController extends Thread{
     private String currentTimer() {
         String timerString = "0:00 minutes";
         if (StreamParser.getTimeSinceStart() > 0) {
-            Long timerMinute = StreamParser.getTimeSinceStart() / 60;
-            Long timerSecond = StreamParser.getTimeSinceStart() % 60;
+            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";
         } else {
-            Long timerMinute = -1 * StreamParser.getTimeSinceStart() / 60;
-            Long timerSecond = -1 * StreamParser.getTimeSinceStart() % 60;
+            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";
         }
         return timerString;