From 6abea16a992fcc3a0bd057674a062b2ad62f1c5d Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sun, 2 Oct 2016 21:23:14 +1300 Subject: [PATCH] Added Enter to submit Forms --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../group9/GUI/AirlineAddController.java | 14 ++++++++++++++ .../group9/GUI/AirlineEditController.java | 16 ++++++++++++++++ .../group9/GUI/AirlineFilterController.java | 15 +++++++++++++++ .../group9/GUI/AirportAddController.java | 14 ++++++++++++++ .../group9/GUI/AirportEditController.java | 14 ++++++++++++++ .../group9/GUI/AirportFilterController.java | 14 ++++++++++++++ .../group9/GUI/FlightAddController.java | 14 ++++++++++++++ .../group9/GUI/FlightEditorController.java | 14 ++++++++++++++ .../seng202/group9/GUI/NewPathController.java | 14 ++++++++++++++ .../group9/GUI/RouteAddController.java | 14 ++++++++++++++ .../group9/GUI/RouteEditController.java | 14 ++++++++++++++ .../group9/GUI/RouteFilterController.java | 18 +++++++++--------- src/main/resources/airline_edit_form.fxml | 7 ++++++- src/main/resources/airline_filter_form.fxml | 7 ++++++- src/main/resources/airport_add_form.fxml | 7 ++++++- src/main/resources/airport_edit_form.fxml | 2 +- src/main/resources/airport_filter_form.fxml | 2 +- src/main/resources/flight_add_form.fxml | 2 +- src/main/resources/flight_editor_form.fxml | 2 +- src/main/resources/new_flight_path.fxml | 2 +- src/main/resources/route_add_form.fxml | 2 +- src/main/resources/route_edit_form.fxml | 2 +- src/main/resources/route_filter_form.fxml | 2 +- 24 files changed, 192 insertions(+), 20 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 49c3eca1affc656914630bd42cbbc9fa235fc7ff..4552564565dbe904af7f1f865c1e4f99354bc81e 100644 GIT binary patch delta 530 zcmWl|*)o;^0LJm}wN;eTBJq_Jy``v#l*+fD1<{7e((+i!QizBw2hTXw(R&45LSq~` z=vGX3(2TSC`_24TcmHLsa-$@Oe#Fz+QLO4u-kPky%CIu6EGyf}vG!T}tpirBm1iBa z4q5ruVe5!hU>&uNS;wstR-tv$DzZ*l#a4+Gw@zDUtWxW&Rc4*D&RgYHg>~VV!kx@-lowX{hsx5^-yMy1! ztZ29x>};<^!$gq$8w)F6YHnEv4Y~=;E@ggs= zogM7tWp?ojyBTGSaVB_`J-o*2yun`H6<>3aZ}^r=e8>0vz-6xRBUib`Ph8)Q#6SP} FwFemis)7Ij diff --git a/src/main/java/seng202/group9/GUI/AirlineAddController.java b/src/main/java/seng202/group9/GUI/AirlineAddController.java index c736075..1ca361b 100644 --- a/src/main/java/seng202/group9/GUI/AirlineAddController.java +++ b/src/main/java/seng202/group9/GUI/AirlineAddController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; @@ -30,6 +34,8 @@ public class AirlineAddController extends Controller { private TextField airlActiveAdd; @FXML private Button addButton; + @FXML + private GridPane airlineContainer; //Set an empty Dataset to be assigned to the current dataset. private Dataset theDataSet = null; @@ -39,6 +45,14 @@ public class AirlineAddController extends Controller { */ public void load() { theDataSet = getParent().getCurrentDataset(); + airlineContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + addAirlineSingle(); + } + } + }); } /** diff --git a/src/main/java/seng202/group9/GUI/AirlineEditController.java b/src/main/java/seng202/group9/GUI/AirlineEditController.java index 545e5e4..e186de3 100644 --- a/src/main/java/seng202/group9/GUI/AirlineEditController.java +++ b/src/main/java/seng202/group9/GUI/AirlineEditController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.DataException; import seng202.group9.Controller.Dataset; @@ -35,6 +39,9 @@ public class AirlineEditController extends Controller { private TextField airlActiveEdit; @FXML private Button applyButton; + @FXML + private GridPane airlineContainer; + //Sets up an empty Dataset to be assigned to the current dataset. private Dataset theDataSet = null; @@ -53,6 +60,15 @@ public class AirlineEditController extends Controller { theDataSet = getParent().getCurrentDataset(); currentSession = getParent().getSession(); + airlineContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + editAirline(); + } + } + }); + toEdit = theDataSet.getAirlineDictionary().get(currentSession.getAirlineToEdit()); airlNameEdit.setText(toEdit.getName()); diff --git a/src/main/java/seng202/group9/GUI/AirlineFilterController.java b/src/main/java/seng202/group9/GUI/AirlineFilterController.java index 8d0f262..02ae8c0 100644 --- a/src/main/java/seng202/group9/GUI/AirlineFilterController.java +++ b/src/main/java/seng202/group9/GUI/AirlineFilterController.java @@ -2,10 +2,14 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.AirlineFilter; import seng202.group9.Controller.Dataset; @@ -40,6 +44,8 @@ public class AirlineFilterController extends Controller { private TextField airlActiveFilter; @FXML private Button applyButton; + @FXML + private GridPane airlineContainer; private Dataset theDataSet = null; private Session currentSession = null; @@ -55,6 +61,15 @@ public class AirlineFilterController extends Controller { theDataSet = getParent().getCurrentDataset(); currentSession = getParent().getSession(); + airlineContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + filterAirlines(); + } + } + }); + sesFilter = currentSession.getAirlineFilter(); airlNameFilter.setText(sesFilter.get("Name")); diff --git a/src/main/java/seng202/group9/GUI/AirportAddController.java b/src/main/java/seng202/group9/GUI/AirportAddController.java index cf0514b..95b1bf2 100644 --- a/src/main/java/seng202/group9/GUI/AirportAddController.java +++ b/src/main/java/seng202/group9/GUI/AirportAddController.java @@ -1,11 +1,15 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Session; @@ -39,6 +43,8 @@ public class AirportAddController extends Controller { private TextField airpTzAdd; @FXML private Button addButton; + @FXML + private GridPane airportContainer; //Set an empty Dataset to be assigned later private Dataset theDataSet = null; @@ -96,5 +102,13 @@ public class AirportAddController extends Controller { public void load() { theDataSet = getParent().getCurrentDataset(); + airportContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + addAirportSingle(); + } + } + }); } } diff --git a/src/main/java/seng202/group9/GUI/AirportEditController.java b/src/main/java/seng202/group9/GUI/AirportEditController.java index 63d507e..df039df 100644 --- a/src/main/java/seng202/group9/GUI/AirportEditController.java +++ b/src/main/java/seng202/group9/GUI/AirportEditController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.DataException; import seng202.group9.Controller.Dataset; @@ -40,6 +44,8 @@ public class AirportEditController extends Controller { private TextField airpTzEdit; @FXML private Button editButton; + @FXML + private GridPane airportContainer; //Set an empty Dataset to be assigned later private Dataset theDataSet = null; @@ -91,5 +97,13 @@ public class AirportEditController extends Controller { airpTimezoneEdit.setText(Double.toString(toEdit.getTimezone())); airpDSTEdit.setText(toEdit.getDST()); airpTzEdit.setText(toEdit.getTz()); + airportContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + editAirport(); + } + } + }); } } diff --git a/src/main/java/seng202/group9/GUI/AirportFilterController.java b/src/main/java/seng202/group9/GUI/AirportFilterController.java index b802298..595feee 100644 --- a/src/main/java/seng202/group9/GUI/AirportFilterController.java +++ b/src/main/java/seng202/group9/GUI/AirportFilterController.java @@ -1,10 +1,14 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.AirportFilter; import seng202.group9.Controller.Dataset; @@ -43,6 +47,8 @@ public class AirportFilterController extends Controller { private TextField airpTzFilter; @FXML private Button applyButton; + @FXML + private GridPane airportContainer; //Set an empty Dataset to be assigned later private Dataset theDataSet = null; @@ -141,6 +147,14 @@ public class AirportFilterController extends Controller { airpTimezoneFilter.setText(sesFilter.get("Tz")); airpDSTFilter.setText(sesFilter.get("DST")); airpTzFilter.setText(sesFilter.get("Olson")); + airportContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + filterAirports(); + } + } + }); } public void resetForm() { diff --git a/src/main/java/seng202/group9/GUI/FlightAddController.java b/src/main/java/seng202/group9/GUI/FlightAddController.java index b1f845c..cce066a 100644 --- a/src/main/java/seng202/group9/GUI/FlightAddController.java +++ b/src/main/java/seng202/group9/GUI/FlightAddController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Session; @@ -25,6 +29,8 @@ public class FlightAddController extends Controller { private TextField fLongitudeAdd; @FXML private Button flightAddButton; + @FXML + private GridPane flightContainer; //Set an empty Dataset to be assigned later private Dataset theDataSet = null; @@ -37,6 +43,14 @@ public class FlightAddController extends Controller { } theDataSet = getParent().getCurrentDataset(); currentSession = getParent().getSession(); + flightContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + addFlight(); + } + } + }); } public void addFlight() { diff --git a/src/main/java/seng202/group9/GUI/FlightEditorController.java b/src/main/java/seng202/group9/GUI/FlightEditorController.java index b6e0d58..59194d7 100644 --- a/src/main/java/seng202/group9/GUI/FlightEditorController.java +++ b/src/main/java/seng202/group9/GUI/FlightEditorController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Session; @@ -27,6 +31,8 @@ public class FlightEditorController extends Controller{ TextField fLongitudeEdit; @FXML private Button flightEditButton; + @FXML + private GridPane flightContainer; //Set an empty Dataset to be assigned later private Dataset theDataSet = null; @@ -95,6 +101,14 @@ public class FlightEditorController extends Controller{ fAltitudeEdit.setText(Double.toString(flightPoint.getAltitude())); fLatitudeEdit.setText(Double.toString(flightPoint.getLatitude())); fLongitudeEdit.setText(Double.toString(flightPoint.getLongitude())); + flightContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + editFlight(); + } + } + }); } } diff --git a/src/main/java/seng202/group9/GUI/NewPathController.java b/src/main/java/seng202/group9/GUI/NewPathController.java index 0395f6a..c55b50e 100644 --- a/src/main/java/seng202/group9/GUI/NewPathController.java +++ b/src/main/java/seng202/group9/GUI/NewPathController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.EntryParser; @@ -19,11 +23,21 @@ public class NewPathController extends Controller { private TextField destinationAirport; @FXML private Button addButton; + @FXML + private GridPane flightContainer; private Dataset theDataSet = null; public void load() { theDataSet = getParent().getCurrentDataset(); + flightContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + addPath(); + } + } + }); } /** diff --git a/src/main/java/seng202/group9/GUI/RouteAddController.java b/src/main/java/seng202/group9/GUI/RouteAddController.java index 8af7fa1..7b964c0 100644 --- a/src/main/java/seng202/group9/GUI/RouteAddController.java +++ b/src/main/java/seng202/group9/GUI/RouteAddController.java @@ -1,11 +1,15 @@ package seng202.group9.GUI; import javafx.collections.FXCollections; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.Dataset; @@ -28,6 +32,8 @@ public class RouteAddController extends Controller { private TextField rEquipmentAdd; @FXML private Button addButton; + @FXML + private GridPane routeContainer; private Dataset theDataSet = null; @@ -78,5 +84,13 @@ public class RouteAddController extends Controller { return; } theDataSet = getParent().getCurrentDataset(); + routeContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + addRouteSingle(); + } + } + }); } } diff --git a/src/main/java/seng202/group9/GUI/RouteEditController.java b/src/main/java/seng202/group9/GUI/RouteEditController.java index 97c2002..a4ded9c 100644 --- a/src/main/java/seng202/group9/GUI/RouteEditController.java +++ b/src/main/java/seng202/group9/GUI/RouteEditController.java @@ -1,9 +1,13 @@ package seng202.group9.GUI; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; +import javafx.scene.layout.GridPane; import javafx.stage.Stage; import seng202.group9.Controller.DataException; import seng202.group9.Controller.Dataset; @@ -29,6 +33,8 @@ public class RouteEditController extends Controller { private TextField rEquipmentEdit; @FXML private Button editButton; + @FXML + private GridPane routeContainer; private Dataset theDataSet = null; @@ -72,5 +78,13 @@ public class RouteEditController extends Controller { rCodeshareEdit.setText(toEdit.getCode()); rStopsEdit.setText(Integer.toString(toEdit.getStops())); rEquipmentEdit.setText(toEdit.getEquipment()); + routeContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + editRoute(); + } + } + }); } } diff --git a/src/main/java/seng202/group9/GUI/RouteFilterController.java b/src/main/java/seng202/group9/GUI/RouteFilterController.java index d2cc650..a9cdc41 100644 --- a/src/main/java/seng202/group9/GUI/RouteFilterController.java +++ b/src/main/java/seng202/group9/GUI/RouteFilterController.java @@ -39,7 +39,7 @@ public class RouteFilterController extends Controller { @FXML private Button applyButton; @FXML - private GridPane airlineAddForm; + private GridPane routeContainer; private Dataset theDataSet = null; //Set an empty session to be assigned to the current session. @@ -106,14 +106,6 @@ public class RouteFilterController extends Controller { } theDataSet = getParent().getCurrentDataset(); currentSession = getParent().getSession(); - airlineAddForm.setOnKeyPressed(new EventHandler(){ - @Override - public void handle(KeyEvent event) { - if (event.getCode().equals(KeyCode.ENTER)){ - filterRoutes(); - } - } - }); sesFilter = currentSession.getRouteFilter(); rAirlineFilter.setText(sesFilter.get("Airline")); rSourceFilter.setText(sesFilter.get("Source")); @@ -121,6 +113,14 @@ public class RouteFilterController extends Controller { rCodeshareFilter.setText(sesFilter.get("Codeshare")); rStopsFilter.setText(sesFilter.get("Stops")); rEquipmentFilter.setText(sesFilter.get("Equipment")); + routeContainer.setOnKeyPressed(new EventHandler(){ + @Override + public void handle(KeyEvent event) { + if (event.getCode().equals(KeyCode.ENTER)){ + filterRoutes(); + } + } + }); } public void resetForm() { diff --git a/src/main/resources/airline_edit_form.fxml b/src/main/resources/airline_edit_form.fxml index 0181fc5..ac9d0d6 100644 --- a/src/main/resources/airline_edit_form.fxml +++ b/src/main/resources/airline_edit_form.fxml @@ -1,5 +1,10 @@ + + + + + @@ -9,7 +14,7 @@ - + diff --git a/src/main/resources/airline_filter_form.fxml b/src/main/resources/airline_filter_form.fxml index 6278a2a..a633fdc 100644 --- a/src/main/resources/airline_filter_form.fxml +++ b/src/main/resources/airline_filter_form.fxml @@ -1,5 +1,10 @@ + + + + + @@ -9,7 +14,7 @@ - + diff --git a/src/main/resources/airport_add_form.fxml b/src/main/resources/airport_add_form.fxml index f65f332..3320fa4 100644 --- a/src/main/resources/airport_add_form.fxml +++ b/src/main/resources/airport_add_form.fxml @@ -1,5 +1,10 @@ + + + + + @@ -9,7 +14,7 @@ - + diff --git a/src/main/resources/airport_edit_form.fxml b/src/main/resources/airport_edit_form.fxml index 2531b03..9da7a31 100644 --- a/src/main/resources/airport_edit_form.fxml +++ b/src/main/resources/airport_edit_form.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/airport_filter_form.fxml b/src/main/resources/airport_filter_form.fxml index 31a6fe5..b255d79 100644 --- a/src/main/resources/airport_filter_form.fxml +++ b/src/main/resources/airport_filter_form.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/flight_add_form.fxml b/src/main/resources/flight_add_form.fxml index a82c803..f574e1d 100644 --- a/src/main/resources/flight_add_form.fxml +++ b/src/main/resources/flight_add_form.fxml @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/flight_editor_form.fxml b/src/main/resources/flight_editor_form.fxml index 31b0702..568f643 100644 --- a/src/main/resources/flight_editor_form.fxml +++ b/src/main/resources/flight_editor_form.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/new_flight_path.fxml b/src/main/resources/new_flight_path.fxml index a9c0f08..6ae5d85 100644 --- a/src/main/resources/new_flight_path.fxml +++ b/src/main/resources/new_flight_path.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/route_add_form.fxml b/src/main/resources/route_add_form.fxml index 2f5b6f7..3ba9e7f 100644 --- a/src/main/resources/route_add_form.fxml +++ b/src/main/resources/route_add_form.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/route_edit_form.fxml b/src/main/resources/route_edit_form.fxml index 86b816c..75d43bf 100644 --- a/src/main/resources/route_edit_form.fxml +++ b/src/main/resources/route_edit_form.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/route_filter_form.fxml b/src/main/resources/route_filter_form.fxml index a70595d..bd3fcb4 100644 --- a/src/main/resources/route_filter_form.fxml +++ b/src/main/resources/route_filter_form.fxml @@ -9,7 +9,7 @@ - +