From 39efafc75f8f2c5090416566f1467baa0958c35e Mon Sep 17 00:00:00 2001
From: Zhi You Tan <zyt10@uclive.ac.nz>
Date: Mon, 15 May 2017 10:36:20 +1200
Subject: [PATCH] Fixed Annotation.java, ImportantAnnotationController.java,
 RaceViewController.java to include estimate time to next mark after merge

#story[924]
---
 .../java/seng302/controllers/RaceViewController.java   |  7 +++++++
 .../seng302/controllers/annotations/Annotation.java    |  3 ++-
 .../annotations/ImportantAnnotationController.java     | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index b38aa4ca..cce59db3 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -340,6 +340,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         else{
             bg.setWakeVisible(false);
         }
+
+        if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) {
+            bg.setEstTimeToNextMarkVisible(true);
+        }
+        else {
+            bg.setEstTimeToNextMarkVisible(false);
+        }
     }
 
     private void setAnnotations(Integer annotationLevel) {
diff --git a/src/main/java/seng302/controllers/annotations/Annotation.java b/src/main/java/seng302/controllers/annotations/Annotation.java
index eed70162..0eea5ee2 100644
--- a/src/main/java/seng302/controllers/annotations/Annotation.java
+++ b/src/main/java/seng302/controllers/annotations/Annotation.java
@@ -7,5 +7,6 @@ public enum Annotation {
     SPEED,
     WAKE,
     TRACK,
-    NAME
+    NAME,
+    ESTTIMETONEXTMARK
 }
diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
index 5220b8fb..95fe84d3 100644
--- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
+++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java
@@ -94,8 +94,8 @@ public class ImportantAnnotationController implements Initializable {
                     boatNameSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
-                case "BoatEstTimeToNextMark":
-                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotations.get(key));
+                case ESTTIMETONEXTMARK:
+                    boatEstTimeToNextMarkSelect.setSelected(importantAnnotationsState.getAnnotationState(annotation));
                     break;
 
                 default:
@@ -115,11 +115,7 @@ public class ImportantAnnotationController implements Initializable {
         boatSpeedSelect.setOnAction(event -> setAnnotation(Annotation.SPEED, boatSpeedSelect.isSelected()));
         boatTrackSelect.setOnAction(event -> setAnnotation(Annotation.TRACK, boatTrackSelect.isSelected()));
         boatNameSelect.setOnAction(event -> setAnnotation(Annotation.NAME, boatNameSelect.isSelected()));
-
-        boatEstTimeToNextMarkSelect.setOnAction(event -> {
-            setAnnotation("BoatEstTimeToNextMark", boatEstTimeToNextMarkSelect.isSelected());
-            sendUpdate();
-        });
+        boatEstTimeToNextMarkSelect.setOnAction(event -> setAnnotation(Annotation.ESTTIMETONEXTMARK, boatEstTimeToNextMarkSelect.isSelected()));
 
         closeButton.setOnAction(event -> stage.close());
     }