diff --git a/res/.nfs00000000024419e400000284 b/res/.nfs00000000024419e400000284 deleted file mode 100644 index 6063088..0000000 Binary files a/res/.nfs00000000024419e400000284 and /dev/null differ diff --git a/res/userdb.db b/res/userdb.db index 6063088..dd0d554 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 7ca792b..64d3732 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -1545,7 +1545,12 @@ public class Dataset { public void deleteFlightPath(FlightPath flightPath){ //delete all flight points with the id while(flightPath.getFlightPoints().size() > 0){ - deleteFlightPoint(flightPath.getFlightPoints().get(0), flightPath); + try { + flightPointDictionary.remove(flightPath.getFlightPoints().get(0).getID()); + flightPath.getFlightPoints().remove(0); + } catch (DataException e) { + e.printStackTrace(); + } } //drop the entries Connection c = null; @@ -1605,6 +1610,7 @@ public class Dataset { stmt.close(); int index = flightPath.getFlightPoints().indexOf(flightPoint); + System.out.println(index); if (index == 0){ try { diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 23a8e2c..e3e37ce 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -261,7 +261,7 @@ public class FlightRDController extends Controller { /** * Will link to the flight analyser when implemented. */ - private void flightAnalyser(){ + public void flightAnalyser(){ JOptionPane.showMessageDialog(null, "This is not Implemented yet"); }