From 24667991f1d9b6b19b4e512bbb474e1ab7d8a999 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Thu, 4 May 2017 14:39:29 +1200
Subject: [PATCH] Merge on to master

Final Push
---
 src/main/java/seng302/controllers/CanvasController.java  | 9 ++++-----
 .../java/seng302/controllers/RaceViewController.java     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index afd9e4d8..259311cc 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -17,6 +17,7 @@ import javafx.stage.Stage;
 import seng302.models.*;
 import seng302.models.mark.*;
 import seng302.models.parsers.StreamParser;
+import seng302.models.parsers.StreamReceiver;
 import seng302.models.parsers.packets.BoatPositionPacket;
 import seng302.models.parsers.XMLParser;
 import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark;
@@ -129,13 +130,11 @@ public class CanvasController {
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
                 elapsedNanos = 1000 / 60;
                 updateRaceObjects();
-
+                if (StreamParser.isRaceFinished()) {
+                    this.stop();
+                }
             }
         };
-        for (Mark m : raceViewController.getRace().getCourse()) {
-            //System.out.println(m.getName());
-        }
-        //timer.start();
     }
 
 
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 3b7ee6b5..a4cc2ece 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -309,7 +309,7 @@ public class RaceViewController extends Thread{
 //        }
 
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
-            System.out.println(boat.getBoatStatus());
+//            System.out.println(boat.getBoatStatus());
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
                         boat.getShortName() + " (Finished)"));