Merge branch 'develop' into story1118_map_arrows

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/model/RaceState.java
#	src/main/java/seng302/visualiser/GameClient.java

src/main/java/seng302/visualiser/fxObjects/AnnotationBox.java

@@ -95,7 +95,7 @@ public class AnnotationBox extends Group {
         background.setStroke(theme);
         background.setStrokeWidth(2);
         background.setCache(true);
-        background.setCacheHint(CacheHint.SPEED);
+        background.setCacheHint(CacheHint.SCALE);
         this.getChildren().add(background);
     }
 
@@ -213,7 +213,7 @@ public class AnnotationBox extends Group {
         Text text = new Text();
         text.setFill(theme);
         text.setStrokeWidth(2);
-        text.setCacheHint(CacheHint.SPEED);
+//        text.setCacheHint(CacheHint.QUALITY);
         text.setCache(true);
         return text;
     }

src/main/java/seng302/visualiser/fxObjects/BoatObject.java

@@ -1,9 +1,9 @@
 package seng302.visualiser.fxObjects;
 
 import java.util.ArrayList;
+import java.util.List;
 import javafx.application.Platform;
 import javafx.geometry.Point2D;
-import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.paint.Color;
@@ -24,6 +24,12 @@ import javafx.scene.transform.Rotate;
  */
 public class BoatObject extends Group {
 
+    @FunctionalInterface
+    public interface SelectedBoatListener {
+
+        void notifySelected(BoatObject boatObject, Boolean isSelected);
+    }
+
     //Constants for drawing
     private static final double BOAT_HEIGHT = 15d;
     private static final double BOAT_WIDTH = 10d;
@@ -42,9 +48,11 @@ public class BoatObject extends Group {
     private double distanceTravelled, lastRotation;
     private Point2D lastPoint;
     private Paint colour = Color.BLACK;
-    private Boolean isSelected, destinationSet;  //All boats are initialised as selected
+    private Boolean isSelected = false, destinationSet;  //All boats are initialised as selected
     private boolean isPlayer = false;
 
+    private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
+
     /**
      * Creates a BoatGroup with the default triangular boat polygon.
      */
@@ -86,7 +94,7 @@ public class BoatObject extends Group {
         });
         boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));
         boatPoly.setCache(true);
-        boatPoly.setCacheHint(CacheHint.SPEED);
+//        boatPoly.setCacheHint(CacheHint.SPEED);
 
 //        annotationBox = new AnnotationBox();
 //        annotationBox.setFill(colour);
@@ -288,6 +296,7 @@ public class BoatObject extends Group {
 //    }
 
     public void setIsSelected(Boolean isSelected) {
+        updateListener(isSelected);
         this.isSelected = isSelected;
         setLineGroupVisible(isSelected);
         setWakeVisible(isSelected);
@@ -367,6 +376,10 @@ public class BoatObject extends Group {
         lastHeading = heading;
     }
 
+    public Boolean getSelected() {
+        return isSelected;
+    }
+
     public void setTrajectory(double heading, double velocity, double scaleFactorX, double scaleFactorY) {
 //        wake.setRotation(lastHeading - heading, velocity);
 //        rotateTo(heading);
@@ -374,4 +387,14 @@ public class BoatObject extends Group {
 //        yVelocity = Math.sin(Math.toRadians(heading)) * velocity * scaleFactorY;
         lastHeading = heading;
     }
+
+    private void updateListener(Boolean isSelected) {
+        for (SelectedBoatListener sbl : selectedBoatListenerListeners) {
+            sbl.notifySelected(this, isSelected);
+        }
+    }
+
+    public void addSelectedBoatListener(SelectedBoatListener sbl) {
+        selectedBoatListenerListeners.add(sbl);
+    }
 }