Fixing some of the SharedModel/seng302 import conflicts

-Am really not liking the SharedModel structure, think reverting back to original structure is worth discussing

story[778]

sharedModel/src/main/java/SharedModel/BoatInRace.java

@@ -25,6 +25,9 @@ public class BoatInRace extends Boat {
     private boolean started = false;
     private StringProperty position;
     private double heading;
+    private int sourceID;
+
+
 
     ///While generating BoatLocationMessages, each one needs a sequence number relating to each boat.
     private long sequenceNumber = 0;
@@ -45,8 +48,11 @@ public class BoatInRace extends Boat {
         setColour(colour);
         currentLegName = new SimpleStringProperty("");
         position = new SimpleStringProperty("-");
+        this.sourceID = sourceID;
     }
 
+
+
     /**
      * Converts an azimuth to a bearing
      *
@@ -264,6 +270,15 @@ public class BoatInRace extends Boat {
         return position;
     }
 
+    @Override
+    public int getSourceID() {
+        return sourceID;
+    }
+
+    public void setSourceID(int sourceID) {
+        this.sourceID = sourceID;
+    }
+
     /**
      * Returns the current sequence number, and increments the internal value, such that that next call will return a value 1 larger than the current call.
      *