Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability.

#story[986] #refactor
2026-05-09 14:28:43 +00:00 · 2017-07-24 12:14:08 +12:00
parent 3ec1242a9a
commit aad93d8913
33 changed files with 1515 additions and 1682 deletions
@@ -0,0 +1,192 @@
+package seng302.model;
+
+import javafx.scene.paint.Color;
+import seng302.model.mark.Mark;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.visualiser.controllers.RaceViewController;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+/**
+ * Yacht class for the racing boat.
+ *
+ * Class created to store more variables (eg. boat statuses) compared to the XMLParser boat class,
+ * also done outside Boat class because some old variables are not used anymore.
+ */
+public class Boat {
+
+    // Used in boat group
+    private Color colour = Color.BLACK;
+
+    private String boatType;
+    private Integer sourceID;
+    private String hullID; //matches HullNum in the XML spec.
+    private String shortName;
+    private String boatName;
+    private String country;
+
+    // Boat status
+    private Integer boatStatus;
+    private Integer legNumber = 0;
+    private Integer position = 0;
+    private Integer penaltiesAwarded;
+    private Integer penaltiesServed;
+    private Long estimateTimeAtFinish;
+    private Double lat;
+    private Double lon;
+    private Double heading;
+    private double velocity;
+    private Long timeTillNext;
+    private Long markRoundTime;
+
+    // Mark rounding
+    private Mark lastMarkRounded;
+    private Mark nextMark;
+
+    public Boat(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;
+    }
+
+    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) {
+        this.legNumber = legNumber;
+    }
+
+    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 Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer 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 Double getLat() {
+        return lat;
+    }
+
+    public void setLat(Double lat) {
+        this.lat = lat;
+    }
+
+    public Double getLon() {
+        return lon;
+    }
+
+    public void setLon(Double lon) {
+        this.lon = lon;
+    }
+
+    public Double getHeading() {
+        return heading;
+    }
+
+    public void setHeading(Double heading) {
+        this.heading = heading;
+    }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
+
+}