From 3f54e0998b8f158c1d375ccba2ec2c85bc516960 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sat, 1 Oct 2016 17:35:25 +1300 Subject: [PATCH] Fixed Liam's silly, not setting dataset. And Sunguin's merge deleting Liam's Move up and Down buttons --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../group9/GUI/FlightRDController.java | 37 +++++++++++------- .../group9/GUI/FlightSummaryController.java | 2 +- src/main/resources/flight_raw_data.fxml | 9 ++++- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 4f6d70cd15c7450aac0aae5a6333850c37560112..4c19f27d4c83d04cd4fe2847bf7d8c10ce6851d0 100644 GIT binary patch delta 4542 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 diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 74594a2..a4da096 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -17,6 +17,7 @@ import seng202.group9.Core.FlightPoint; import javax.swing.*; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.Optional; /** * Controller for the Flights Raw Data Scene. @@ -117,8 +118,8 @@ public class FlightRDController extends Controller { * Used to load the table for the Flight points initially from the MenuController */ public void load() { + theDataSet = getParent().getCurrentDataset(); if (theDataSet != null) { - theDataSet = getParent().getCurrentDataset(); try { currentPathId = theDataSet.getFlightPaths().get(0).getID(); //Sets the default to the 1st Path } catch (DataException e) { @@ -172,21 +173,29 @@ public class FlightRDController extends Controller { */ public void deletePoint() { FlightPoint toDelete = flightTableView.getSelectionModel().getSelectedItem(); - int pathID; - try { - pathID = toDelete.getIndex(); - } catch (DataException e) { - e.printStackTrace(); - System.err.println("Point is Undeletable as the Index ID is not set."); - return; - } - LinkedHashMap flightPathDict = theDataSet.getFlightPathDictionary(); - FlightPath toDeletesPath = flightPathDict.get(pathID); - theDataSet.deleteFlightPoint(toDelete, toDeletesPath); + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setTitle("Flight Point Delete Confirmation"); + alert.setHeaderText("You are about to delete some data."); + alert.setContentText("Are you sure you want to delete the selected flight point?"); + //alert.showAndWait(); + Optional result = alert.showAndWait(); + if (result.isPresent() && result.get() == ButtonType.OK) { + int pathID; + try { + pathID = toDelete.getIndex(); + } catch (DataException e) { + e.printStackTrace(); + System.err.println("Point is Undeletable as the Index ID is not set."); + return; + } + LinkedHashMap flightPathDict = theDataSet.getFlightPathDictionary(); + FlightPath toDeletesPath = flightPathDict.get(pathID); + theDataSet.deleteFlightPoint(toDelete, toDeletesPath); - currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary().get(pathID)); + currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary().get(pathID)); - updateTable(currentPathIndex); + updateTable(currentPathIndex); + } } /** diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index 62c4281..2843233 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -175,9 +175,9 @@ public class FlightSummaryController extends Controller { * Used to load the page from the MenuController. */ public void load() { + theDataSet = getParent().getCurrentDataset(); if (theDataSet != null) { try { - theDataSet = getParent().getCurrentDataset(); ArrayList flightPaths; flightPaths = theDataSet.getFlightPaths(); for (int i = 0; i < flightPaths.size(); i++) { diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index b0bfb26..e192fd6 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -1,5 +1,10 @@ + + + + + @@ -15,7 +20,7 @@ - + @@ -94,6 +99,8 @@ + +