From e923fe671b02a41dd82a4cd0905f22bb23cc5dc8 Mon Sep 17 00:00:00 2001 From: Erika Savell Date: Sat, 25 Mar 2017 17:34:39 +1300 Subject: [PATCH] Changed race clock to display negative time before race #story[16] #implement --- src/main/java/seng302/Model/Race.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/seng302/Model/Race.java b/src/main/java/seng302/Model/Race.java index a7b30fe2..997cec01 100644 --- a/src/main/java/seng302/Model/Race.java +++ b/src/main/java/seng302/Model/Race.java @@ -114,13 +114,17 @@ public abstract class Race implements Runnable { while (currentTime <= startTime) { timeLeft = startTime - currentTime; - currentTimeInSeconds = timeLeft / 1000; - minutes = currentTimeInSeconds / 60; - remainingSeconds = currentTimeInSeconds % 60; - hours = minutes / 60; - minutes = minutes % 60; - if (controller != null) { - updateTime(String.format("Time until race starts: %02d:%02d:%02d", hours, minutes, remainingSeconds)); + if (timeLeft == 0 && controller != null) { + updateTime("Race is starting..."); + } else { + currentTimeInSeconds = timeLeft / 1000; + minutes = currentTimeInSeconds / 60; + remainingSeconds = currentTimeInSeconds % 60; + hours = minutes / 60; + minutes = minutes % 60; + if (controller != null) { + updateTime(String.format("Time until race starts: -%02d:%02d:%02d", hours, minutes, remainingSeconds)); + } } try { timeLoopEnded = System.currentTimeMillis();