Fixed the Yacht clas so it now works.

Lists and Maps are instantiated as they should be in GameState which were creating NullPointers
Introduced ServerLog to server to client threads for bug reporting
Introduced some print statements to test the game state updating upon receiving key presses

tags: #story[989] #refactor #fix

src/main/java/seng302/models/Yacht.java

@@ -21,13 +21,39 @@ public class Yacht {
 
     private final Double TURN_STEP = 3.0;
 
+    private Double lastHeading;
+    private Boolean sailIn;
+
+
+    // Used in boat group
+    private Color colour;
+
+    private String boatType;
     private Integer sourceID;
+    private String hullID; //matches HullNum in the XML spec.
+    private String shortName;
+    private String boatName;
+    private String country;
+
+    // Situational data
+
+
+    // Boat status
+    private Integer boatStatus;
+    private Integer legNumber;
+    private Integer penaltiesAwarded;
+    private Integer penaltiesServed;
+    private Long estimateTimeAtFinish;
+    private String position;
     private GeoPoint location;
     private Double heading;
-    private Double lastHeading;
     private Double velocity;
+    private Long timeTillNext;
+    private Long markRoundTime;
 
-    private Boolean sailIn;
+    // Mark rounding
+    private Mark lastMarkRounded;
+    private Mark nextMark;
 
 
     /**
@@ -41,6 +67,48 @@ public class Yacht {
         this.sailIn = false;
     }
 
+
+    /**
+     * Used in EventTest and RaceTest.
+     *
+     * @param boatName Create a yacht object with name.
+     */
+    public Yacht(String boatName, String shortName, GeoPoint location, Double heading) {
+        this.boatName = boatName;
+        this.shortName = shortName;
+        this.location = location;
+        this.heading = heading;
+        this.velocity = 0.0;
+        this.sailIn = false;
+    }
+
+    /**
+     * Used in BoatGroupTest.
+     *
+     * @param boatName The name of the team sailing the boat
+     * @param boatVelocity The speed of the boat in meters/second
+     * @param shortName A shorter version of the teams name
+     */
+    public Yacht(String boatName, double boatVelocity, String shortName, int id) {
+        this.boatName = boatName;
+        this.velocity = boatVelocity;
+        this.shortName = shortName;
+        this.sourceID = id;
+        this.sailIn = false;
+    }
+
+    public Yacht(String boatType, Integer sourceID, String hullID, String shortName,
+                 String boatName, String country) {
+        this.boatType = boatType;
+        this.sourceID = sourceID;
+        this.hullID = hullID;
+        this.shortName = shortName;
+        this.boatName = boatName;
+        this.country = country;
+        this.position = "-";
+        this.sailIn = false;
+    }
+
     /**
      * @param timeInterval since last update in milliseconds
      */
@@ -122,4 +190,139 @@ public class Yacht {
             adjustHeading(-TURN_STEP);
         }
     }
+
+
+    public String getBoatType() {
+        return boatType;
+    }
+
+    public Integer getSourceID() {
+        return sourceID;
+    }
+
+    public String getHullID() {
+        return hullID;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public String getBoatName() {
+        return boatName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public Integer getBoatStatus() {
+        return boatStatus;
+    }
+
+    public void setBoatStatus(Integer boatStatus) {
+        this.boatStatus = boatStatus;
+    }
+
+    public Integer getLegNumber() {
+        return legNumber;
+    }
+
+    public void setLegNumber(Integer legNumber) {
+        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+        }
+        this.legNumber = legNumber;
+    }
+
+    public Integer getPenaltiesAwarded() {
+        return penaltiesAwarded;
+    }
+
+    public void setPenaltiesAwarded(Integer penaltiesAwarded) {
+        this.penaltiesAwarded = penaltiesAwarded;
+    }
+
+    public Integer getPenaltiesServed() {
+        return penaltiesServed;
+    }
+
+    public void setPenaltiesServed(Integer penaltiesServed) {
+        this.penaltiesServed = penaltiesServed;
+    }
+
+    public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) {
+        timeTillNext = estimateTimeAtNextMark;
+    }
+
+    public String getEstimateTimeAtFinish() {
+        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return format.format(estimateTimeAtFinish);
+    }
+
+    public void setEstimateTimeAtFinish(Long estimateTimeAtFinish) {
+        this.estimateTimeAtFinish = estimateTimeAtFinish;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Color getColour() {
+        return colour;
+    }
+
+    public void setColour(Color colour) {
+        this.colour = colour;
+    }
+
+    public void setVelocity(double velocity) {
+        this.velocity = velocity;
+    }
+
+
+    public void setMarkRoundingTime(Long markRoundingTime) {
+        this.markRoundTime = markRoundingTime;
+    }
+
+    public double getVelocity() {
+        return velocity;
+    }
+
+    public Long getTimeTillNext() {
+        return timeTillNext;
+    }
+
+    public Long getMarkRoundTime() {
+        return markRoundTime;
+    }
+
+    public Mark getLastMarkRounded() {
+        return lastMarkRounded;
+    }
+
+    public void setLastMarkRounded(Mark lastMarkRounded) {
+        this.lastMarkRounded = lastMarkRounded;
+    }
+
+    public void setNextMark(Mark nextMark) {
+        this.nextMark = nextMark;
+    }
+
+    public Mark getNextMark(){
+        return nextMark;
+    }
+
+    public Boolean getSailIn() {
+        return sailIn;
+    }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
 }