diff --git a/res/userdb.db b/res/userdb.db index 4c19f27..7f67671 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index a4da096..51fc8b3 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -195,6 +195,7 @@ public class FlightRDController extends Controller { currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary().get(pathID)); updateTable(currentPathIndex); + updatePaths(); } } @@ -214,6 +215,7 @@ public class FlightRDController extends Controller { } createPopUpStage(SceneCode.FLIGHT_EDITOR, 600, 289); updateTable(currentPathIndex); + updatePaths(); } /** @@ -230,6 +232,8 @@ public class FlightRDController extends Controller { theDataSet.deleteFlightPath(toDeleteIndex); flightPathListView.getItems().clear(); flightPathListView(); + updatePaths(); + updateTable(0); } /** @@ -273,9 +277,14 @@ public class FlightRDController extends Controller { private void updateTable(int currentPathIndex) { ArrayList flightPaths; flightPaths = theDataSet.getFlightPaths(); - ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); - flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); - flightTableView.refresh(); + if (flightPaths.size() != 0) { + ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); + flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + flightTableView.refresh(); + }else{ + flightTableView.getItems().clear(); + flightTableView.refresh(); + } } /** diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 3bbbaea..9673414 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -19,6 +19,7 @@ public class MenuController extends Controller{ public void importAirports(){ Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage()); + } public void importAirlines(){