From 72c9f645e8380b874c646456af41a8d25ef667b9 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Mon, 3 Oct 2016 02:10:54 +1300
Subject: [PATCH] Added set filter to whole dataset if it is not set

---
 .../java/seng202/group9/Controller/App.java   | 29 +++++++++++++++++++
 src/main/java/seng202/group9/Core/Route.java  |  5 ++++
 2 files changed, 34 insertions(+)

diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index e43f39d..dbf9939 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -26,6 +26,7 @@ import javafx.stage.Stage;
 import seng202.group9.Core.Airline;
 import seng202.group9.Core.Airport;
 import seng202.group9.Core.FlightPath;
+import seng202.group9.Core.Route;
 import seng202.group9.GUI.*;
 
 /**
@@ -85,6 +86,34 @@ public class App extends Application
 			for (int i = 0; i < datasets.size(); i ++) {
 				if (datasets.get(i).getName().equals(session.getCurrentDataset())) {
 					currentDataset = datasets.get(i);
+
+					if (session.getFilteredAirlines().size() == 0) {
+						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);
+					}
+
+					if (session.getFilteredAirports().size() == 0) {
+						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);
+					}
+
+					if (session.getFilteredRoutes().size() == 0) {
+						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();
 				}
 			}
 		}
diff --git a/src/main/java/seng202/group9/Core/Route.java b/src/main/java/seng202/group9/Core/Route.java
index 16907b2..03584b0 100644
--- a/src/main/java/seng202/group9/Core/Route.java
+++ b/src/main/java/seng202/group9/Core/Route.java
@@ -280,6 +280,11 @@ public class Route {
 		return routePath;
 	}
 
+	public String getUniqueKey(){
+		//key routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
+		return airlineName + departureAirport + arrivalAirport + codeShare + String.valueOf(stops) + equipment;
+	}
+
 	/**
 	 * What to print if printed as a string.
 	 * @return