fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Filter Data Dictionary Key error from the GUI

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-09-30 13:19:40 +13:00
parent 79b73f845e
commit dd2045d147
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/AirlineRDController.java
+4 -10
View File
@@ -81,17 +81,11 @@ public class AirlineRDController extends Controller {
*/
public void openFilter() {
createPopUpStage(SceneCode.AIRLINE_FILTER, 600, 370);
if (currentSession.getFilteredAirlines() != null) {
ArrayList<Airline> d = new ArrayList();
for (int i = 0; i < theDataSet.getAirlines().size(); i++) {
if (currentSession.getFilteredAirlines().containsValue(theDataSet.getAirlines().get(i).getName())
&& currentSession.getFilteredAirlines().containsKey(i)) {
d.add(theDataSet.getAirlines().get(i));
}
}
tableViewAirlineRD.setItems(FXCollections.observableArrayList(d));
ArrayList<Airline> d = new ArrayList();
for (int key: currentSession.getFilteredAirlines().keySet()){
d.add(theDataSet.getAirlineDictionary().get(currentSession.getFilteredAirlines().get(key)));
}
tableViewAirlineRD.setItems(FXCollections.observableArrayList(d));
}
src/main/java/seng202/group9/GUI/AirportRDController.java
+4 -10
View File
@@ -88,17 +88,11 @@ public class AirportRDController extends Controller{
public void openFilter() {
createPopUpStage(SceneCode.AIRPORT_FILTER, 600, 480);
if (currentSession.getFilteredAirports() != null) {
ArrayList<Airport> d = new ArrayList();
for (int i = 0; i < theDataSet.getAirports().size(); i++) {
if (currentSession.getFilteredAirports().containsValue(theDataSet.getAirports().get(i).getName())
&& currentSession.getFilteredAirports().containsKey(i)) {
d.add(theDataSet.getAirports().get(i));
}
}
tableViewAirportRD.setItems(FXCollections.observableArrayList(d));
ArrayList<Airport> d = new ArrayList();
for (int key: currentSession.getFilteredAirports().keySet()){
d.add(theDataSet.getAirportDictionary().get(currentSession.getFilteredAirports().get(key)));
}
tableViewAirportRD.setItems(FXCollections.observableArrayList(d));
}
/**
src/main/java/seng202/group9/GUI/RouteFilterController.java
+3 -2
View File
@@ -72,11 +72,12 @@ public class RouteFilterController extends Controller {
alert.showAndWait();
//currentSession.setFilteredAirlines(FXCollections.observableArrayList(filter.getFilteredData()));
//routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
HashMap<Integer, String> routesHM = new HashMap<Integer, String>();
ArrayList<Route> routes = filter.getFilteredData();
for (int index = 0; index < routes.size(); index++) {
routesHM.put(index, routes.get(index).getAirlineName());
routesHM.put(index, routes.get(index).getAirlineName() + routes.get(index).getDepartureAirport() + routes.get(index).getArrivalAirport()
+ routes.get(index).getCode() + routes.get(index).getStops() + routes.get(index).getEquipment());
}
currentSession.setFilteredRoutes(routesHM);
src/main/java/seng202/group9/GUI/RouteRDController.java
+5 -9
View File
@@ -78,16 +78,12 @@ public class RouteRDController extends Controller {
public void openFilter() {
createPopUpStage(SceneCode.ROUTE_FILTER, 600, 330);
if (currentSession.getFilteredRoutes() != null) {
ArrayList<Route> d = new ArrayList();
for (int i = 0; i < theDataSet.getRoutes().size(); i++) {
if (currentSession.getFilteredRoutes().containsValue(theDataSet.getRoutes().get(i).getAirlineName())
&& currentSession.getFilteredRoutes().containsKey(i)) {
d.add(theDataSet.getRoutes().get(i));
}
}
tableViewRouteRD.setItems(FXCollections.observableArrayList(d));
ArrayList<Route> d = new ArrayList();
for (int key: currentSession.getFilteredRoutes().keySet()){
d.add(theDataSet.getRouteDictionary().get(currentSession.getFilteredRoutes().get(key)));
}
tableViewRouteRD.setItems(FXCollections.observableArrayList(d));
}
/**