From e3c523a9a5ebbfdf8963530546a577e195bf17bd Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Mon, 3 Oct 2016 04:16:35 +1300
Subject: [PATCH] Fixed Dataset not resetting filter to the full dataset if the
 dataset is changed

---
 .../java/seng202/group9/Controller/App.java   | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index dbf9939..6559da8 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -87,7 +87,7 @@ public class App extends Application
 				if (datasets.get(i).getName().equals(session.getCurrentDataset())) {
 					currentDataset = datasets.get(i);
 
-					if (session.getFilteredAirlines().size() == 0) {
+					if (session.getFilteredAirlines().size() == 0 || session.getFilteredAirlines() == null) {
 						HashMap<Integer, String> airlinesHM = new HashMap<Integer, String>();
 						ArrayList<Airline> airlines = currentDataset.getAirlines();
 						for (int index = 0; index < airlines.size(); index++) {
@@ -96,7 +96,7 @@ public class App extends Application
 						session.setFilteredAirlines(airlinesHM);
 					}
 
-					if (session.getFilteredAirports().size() == 0) {
+					if (session.getFilteredAirports().size() == 0 || session.getFilteredAirports() == null) {
 						HashMap<Integer, String> airportsHM = new HashMap<Integer, String>();
 						ArrayList<Airport> airports = currentDataset.getAirports();
 						for (int index = 0; index < airports.size(); index++) {
@@ -105,15 +105,14 @@ public class App extends Application
 						session.setFilteredAirports(airportsHM);
 					}
 
-					if (session.getFilteredRoutes().size() == 0) {
+					if (session.getFilteredRoutes().size() == 0 || session.getFilteredRoutes() == null) {
 						HashMap<Integer, String> routesHM = new HashMap<Integer, String>();
 						ArrayList<Route> routes = currentDataset.getRoutes();
 						for (int index = 0; index < routes.size(); index++) {
 							routesHM.put(index, routes.get(index).getUniqueKey());
 						}
-						session.setFilteredAirports(routesHM);
+						session.setFilteredRoutes(routesHM);
 					}
-					//session.setFilteredRoutes();
 				}
 			}
 		}
@@ -255,6 +254,27 @@ public class App extends Application
 	public void setCurrentDataset(Dataset dataset){
 		currentDataset = dataset;
 		session.setCurrentDataset(currentDataset.getName());
+
+		HashMap<Integer, String> airlinesHM = new HashMap<Integer, String>();
+		ArrayList<Airline> airlines = currentDataset.getAirlines();
+		for (int index = 0; index < airlines.size(); index++) {
+			airlinesHM.put(index, airlines.get(index).getName());
+		}
+		session.setFilteredAirlines(airlinesHM);
+
+		HashMap<Integer, String> airportsHM = new HashMap<Integer, String>();
+		ArrayList<Airport> airports = currentDataset.getAirports();
+		for (int index = 0; index < airports.size(); index++) {
+			airportsHM.put(index, airports.get(index).getName());
+		}
+		session.setFilteredAirports(airportsHM);
+
+		HashMap<Integer, String> routesHM = new HashMap<Integer, String>();
+		ArrayList<Route> routes = currentDataset.getRoutes();
+		for (int index = 0; index < routes.size(); index++) {
+			routesHM.put(index, routes.get(index).getUniqueKey());
+		}
+		session.setFilteredRoutes(routesHM);
 	}
 
 	/**