From c3dca82a7abfb8bb053e5afc26d25b604576defa Mon Sep 17 00:00:00 2001 From: Sunguin Peng Date: Fri, 23 Sep 2016 14:46:58 +1200 Subject: [PATCH] Implemented multiple delete on airlines --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../group9/GUI/AirlineRDController.java | 20 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 1222444fa8476463644b88670b5f83ef38094555..b80a0f5ec9ce44ebb947a69933d474ba578c5b91 100644 GIT binary patch delta 648 zcmWm9Nl#O86vpBI^%h!cYcEv2D3e&x7PTm%q9P7BPqcMJMaB+5p|z#bDk_P|TbFf1 z6W7FL6Ib_Zura2KhRwS%Y*~;PqsN>)yOW&rTiO1ruZU8MR`}97q!qr8FMGAfr<%7| z^J-#;(1lIZiF#od4$)xMyv|=gowmVBSSh`$(py~LbXx11JNwpjLyZ;fC6{oEUBYA8 zOU9q6`X;rc)Kb~8W%#t=a&XJ&^mkOk4azj#Znw`9o6f}I@mMC7jm9$Z#YAB?H#ak) zlnSVx@<7Suv%YQ_-K@3jMt|s??Ujg>wMkivClO61Q}cz%iG}D)b|JNxh-RV%FaUOgN5Ny@aWDw> zfG5C{U@v$I>;q4OXTY;yKX?v24_*KVz>DA@cnQ1=UIDLyL*O;=I(P%T3El#4gLlBY z;63m@_y8ORLtq$;fDge(;A8L!_!N8wj)2d>7vM{96nq7af#cu=I0;UH(_j>gfpIVa u&VaMv9GC>>!38h{roq=>2F!wsU=Dl(E`fPalHY>wz-90~_~9ErHva=7t{iUw delta 711 zcmW;C%TLn)0LSrmEh2-t&Z!j#%0zTU#0U5U9|)qjI$tOcUju13g~{v&-4unyLp@?b zXhJ-ia3k^5zrh+D#HC`#~|MA@~b$#v^1gT}M!&%?*d+S@ZonKbv;X&Dvm+BC}4g^=_ zB_%0`gcZT{SCnRHRv2*GD@ru31p zUDIoX`Y3TENb;{T{*T);)HjwZ9)soMr>ZahEFDB5rg?KqATIEho}KqpS)49?;l&f@~Q(2a|@gv+>s9$ZB)`fv^X zxQ-hbz)i%V;}#OQjXSuDd$^B5JitQ?VHhJA#Unh%6FkK;Br%3@JjVnKm`EXw7kG(D jOd*3;m_`<_VIhY+W-tpI1r+fHZ!w2=c<;&O`QPeagDf1& diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java index 2422ffa..63cbfd2 100644 --- a/src/main/java/seng202/group9/GUI/AirlineRDController.java +++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java @@ -18,6 +18,7 @@ import seng202.group9.Core.Airline; import javax.swing.*; import java.io.IOException; import java.util.ArrayList; +import java.util.Optional; //make a class for the scenes to get the data I guess /** * The GUI controller class for airline_raw_data.fxml. @@ -67,6 +68,7 @@ public class AirlineRDController extends Controller { //Assigning the Dataset to the current Dataset's airlines and displaying it in a table theDataSet = getParent().getCurrentDataset(); tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines())); + tableViewAirlineRD.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); currentSession = getParent().getSession(); } @@ -103,9 +105,21 @@ public class AirlineRDController extends Controller { */ public void deleteAirline() { //Gets an airline from the table and deletes it before updating the table - Airline toDelete = tableViewAirlineRD.getSelectionModel().getSelectedItem(); - theDataSet.deleteAirline(toDelete); - tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines())); + ObservableList toDelete = tableViewAirlineRD.getSelectionModel().getSelectedItems(); + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setTitle("Airline Delete Confirmation"); + alert.setHeaderText("You are about to delete some data."); + alert.setContentText("Are you sure you want to delete the selected airline(s)?"); + //alert.showAndWait(); + Optional result = alert.showAndWait(); + Airline air = null; + if (result.isPresent() && result.get() == ButtonType.OK) { + for (int i = 0; i < toDelete.size(); i++) { + air = toDelete.get(i); + theDataSet.deleteAirline(air); + } + tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines())); + } }