From 5c1dbe775e9a62894d9a4cd72d7eb48f0b4ae2d0 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Fri, 30 Sep 2016 10:36:21 +1300 Subject: [PATCH] Reverted some merge error --- src/main/java/seng202/group9/Controller/Dataset.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 64d3732..813472c 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -206,9 +206,11 @@ public class Dataset { double flightPtTotDist = rs.getDouble("Tot_Dist"); double flightPtLatitude = rs.getDouble("Latitude"); double flightPtLongitude = rs.getDouble("Longitude"); - flightPaths.get(i).addFlightPoint(new FlightPoint(flightPtName, flightPtID, flightPtInd - , flightPtType, flightPtVia, flightPtheading, flightPtAltitude, flightPtLegDistance, flightPtTotDist, - flightPtLatitude, flightPtLongitude)); + FlightPoint flightPoint = new FlightPoint(flightPtName, flightPtID, flightPtInd + , flightPtType, flightPtVia, flightPtheading, flightPtAltitude, flightPtLegDistance, flightPtTotDist, + flightPtLatitude, flightPtLongitude); + flightPaths.get(i).addFlightPoint(flightPoint); + flightPointDictionary.put(flightPtID, flightPoint); } rs.close(); stmt.close();