diff --git a/src/main/java/seng302/models/GateMark.java b/src/main/java/seng302/models/GateMark.java deleted file mode 100644 index c37e84f4..00000000 --- a/src/main/java/seng302/models/GateMark.java +++ /dev/null @@ -1,20 +0,0 @@ -package seng302.models; - -/** - * Created by ptg19 on 16/03/17. - */ -public class GateMark { - private double lat; - private double lon; - private Mark mark1; - private Mark mark2; - private String name; - - public GateMark(String name, Mark mark1, Mark mark2, double lat, double lon){ - this.lat = lat; - this.lon = lon; - this.mark1 = mark1; - this.mark2 = mark2; - this.name = name; - } -} diff --git a/src/main/java/seng302/models/Mark.java b/src/main/java/seng302/models/Mark.java deleted file mode 100644 index 814f44df..00000000 --- a/src/main/java/seng302/models/Mark.java +++ /dev/null @@ -1,59 +0,0 @@ -package seng302.models; - -import java.util.ArrayList; - -/** -* Represents the marker at the beginning of a leg -*/ -public class Mark { - private double lat; - private double lon; - private String name; - private ArrayList boatOrder; - - /** - * Represents a marker - * - * @param name, the name of the marker* - * @param lat, the latitude of the marker - * @param lon, the longitude of the marker - */ - public Mark(String name, double lat, double lon){ - this.name = name; - this.lat = lat; - this.lon = lon; - this.boatOrder = new ArrayList(); - } - - /** - * Represents the marker at the beginning of a leg - * - * @param name, the name of the marker - */ - public Mark(String name){ - this.name = name; - this.lat = 0; - this.lon = 0; - this.boatOrder = new ArrayList(); - } - - public void setName(String name){ - this.name = name; - } - public String getName(){ - return this.name; - } - public void addBoat(Boat boat){ - this.boatOrder.add(boat); - } - public Boat[] getBoats(){ - return this.boatOrder.toArray(new Boat[this.boatOrder.size()]); - } - public double getLatitude(){ - return this.lat; - } - - public double getLongitude(){ - return this.lon; - } -} \ No newline at end of file