Initial work on finding next marks for boats as from mark rounding messages

Marks were very difficult to extend, need large refactor

Marks now have a compound ID as well as their sourceID. They need this compound ID to be identifiable by the
mark rounding messages.

tags: #story[956]  #pair[wmu16, mra106]
This commit is contained in:
William Muir
2017-05-22 18:54:07 +12:00
parent dec742cf54
commit e1b8e19966
13 changed files with 54 additions and 414 deletions
+10
View File
@@ -1,6 +1,7 @@
package seng302.models;
import javafx.scene.paint.Color;
import seng302.models.mark.Mark;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -32,6 +33,7 @@ public class Yacht {
private String position;
// Mark rounding
private Long markRoundingTime;
private Mark lastMarkRounded;
/**
* Used in EventTest and RaceTest.
@@ -167,6 +169,14 @@ public class Yacht {
this.markRoundingTime = markRoundingTime;
}
public Mark getLastMarkRounded() {
return lastMarkRounded;
}
public void setLastMarkRounded(Mark lastMarkRounded) {
this.lastMarkRounded = lastMarkRounded;
}
@Override
public String toString() {
return boatName;