Merge remote-tracking branch 'origin/story9' into story9

# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml

.idea/compiler.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="team-7" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="team-7" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/misc.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (5)" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>$USER_HOME$/.subversion</configuration>
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/team-7.iml" filepath="$PROJECT_DIR$/team-7.iml" />
-    </modules>
-  </component>
-</project>

src/main/java/seng302/Model/BoatInRace.java

@@ -17,6 +17,7 @@ public class BoatInRace extends Boat {
     private GPSCoordinate currentPosition;
     private long timeFinished;
     private Color colour;
+    private boolean finished = false;
 
     /**
      *
@@ -112,6 +113,14 @@ public class BoatInRace extends Boat {
         this.distanceTravelledInLeg = distanceTravelledInLeg;
     }
 
+    public boolean isFinished() {
+        return this.finished;
+    }
+
+    public void setFinished(boolean bool) {
+        this.finished = bool;
+    }
+
 
     /**
      * Calculates the bearing of the travel via map coordinates of the raceMarkers

src/main/java/seng302/Model/Race.java

@@ -110,7 +110,7 @@ public abstract class Race implements Runnable {
 
 
             for (BoatInRace boat : startingBoats) {
-                if (boat != null) {
+                if (boat != null && !boat.isFinished()) {
                     updatePosition(boat, SLEEP_TIME);
                     checkPosition(boat, totalTimeElapsed);
                 }
@@ -139,8 +139,8 @@ public abstract class Race implements Runnable {
             //boat has passed onto new leg
             if (boat.getCurrentLeg().getName().equals("Finish")) {
                 //boat has finished
-                boat.setTimeFinished(timeElapsed);
                 boatsFinished++;
+                boat.setFinished(true);
             } else {
                 boat.setDistanceTravelledInLeg(boat.getDistanceTravelledInLeg() - boat.getCurrentLeg().getDistance());
                 Leg nextLeg = legs.get(boat.getCurrentLeg().getLegNumber() + 1);

src/main/java/seng302/Model/ResizableRaceCanvas.java

@@ -164,7 +164,7 @@ public class ResizableRaceCanvas extends Canvas {
         if (boats != null) {
             for (BoatInRace boat : boats) {
                 if (boat != null) {
-                    System.out.print("Drawing Boat At: " + boat.getCurrentPosition());
+//                    System.out.print("Drawing Boat At: " + boat.getCurrentPosition());
                     displayMark(this.map.convertGPS(boat.getCurrentPosition()), boat.getColour());
                 }
             }
@@ -183,7 +183,7 @@ public class ResizableRaceCanvas extends Canvas {
      */
     public void drawBoat(Color colour, GPSCoordinate gpsCoordinates) {
         GraphCoordinate graphCoordinate =  this.map.convertGPS(gpsCoordinates);
-        System.out.println("DrawingBoat" + gpsCoordinates.getLongitude());
+        //System.out.println("DrawingBoat" + gpsCoordinates.getLongitude());
         displayPoint(graphCoordinate, colour);
     }