From 35db19db2dd3fdb025da376de19ca1cd16ab67c0 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Wed, 14 Sep 2016 10:34:54 +1200 Subject: [PATCH] Not all files were commited from the earlier commit, due to idle functionality misunderstandings --- src/main/java/seng202/group9/Core/FlightPath.java | 7 +++++++ src/main/java/seng202/group9/Core/FlightPoint.java | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng202/group9/Core/FlightPath.java b/src/main/java/seng202/group9/Core/FlightPath.java index 5ab3894..e0df38a 100644 --- a/src/main/java/seng202/group9/Core/FlightPath.java +++ b/src/main/java/seng202/group9/Core/FlightPath.java @@ -20,6 +20,13 @@ public class FlightPath { this.arrivalAirport = arrivalAirport; this.flightPoints = new ArrayList(); } + + public FlightPath(String departureAirport, String arrivalAirport){ + this.ID = -1; + this.departureAirport = departureAirport; + this.arrivalAirport = arrivalAirport; + this.flightPoints = new ArrayList(); + } public ArrayList getFlightPoints() { return flightPoints; diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java index 6115e93..34c043f 100644 --- a/src/main/java/seng202/group9/Core/FlightPoint.java +++ b/src/main/java/seng202/group9/Core/FlightPoint.java @@ -15,14 +15,14 @@ public class FlightPoint { private double latitude; private double longitude; - public FlightPoint(String type, String via, double altitude, double latitude, double longitude){ + public FlightPoint(String type, String name, double altitude, double latitude, double longitude){ //extra calculations will have to be used to find heading, legdistance and total distance. If necessary //Type 1 file the file the lecturers gave us - this.name = ""; + this.name = name; this.ID = -1; this.indexID = -1; this.type = type; - this.via = via; + this.via = ""; this.heading = 0; this.altitude = altitude; this.legDistance = 0.0;