From 3eeb88933ad1354e1ed1a453cdc7fdcecbf0cf84 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Sun, 2 Oct 2016 23:56:31 +1300
Subject: [PATCH] Delete Comments and Created Graphs Skeleton

---
 .../group9/GUI/AirlineGraphController.java    | 13 ++++++++++-
 .../group9/GUI/AirportGraphController.java    | 22 ++++++++++++++++++-
 .../group9/GUI/RouteFilterController.java     |  2 --
 .../group9/GUI/RouteGraphController.java      | 22 ++++++++++++++++++-
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng202/group9/GUI/AirlineGraphController.java b/src/main/java/seng202/group9/GUI/AirlineGraphController.java
index 0d88c7d..f637b36 100644
--- a/src/main/java/seng202/group9/GUI/AirlineGraphController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineGraphController.java
@@ -1,15 +1,26 @@
 package seng202.group9.GUI;
 
+import javafx.fxml.FXML;
+import javafx.scene.layout.GridPane;
+import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
+
+import static javafx.application.ConditionalFeature.FXML;
 
 /**
  * Created by Gondr on 2/10/2016.
  */
 public class AirlineGraphController extends Controller{
+    private Dataset dataset;
+    private Session session;
+    @FXML
+    private GridPane chartContainer;
 
     @Override
     public void load() {
-
+        dataset = getParent().getCurrentDataset();
+        session = getParent().getSession();
     }
 
     public void goToRawData(){
diff --git a/src/main/java/seng202/group9/GUI/AirportGraphController.java b/src/main/java/seng202/group9/GUI/AirportGraphController.java
index 133a28b..7bf6110 100644
--- a/src/main/java/seng202/group9/GUI/AirportGraphController.java
+++ b/src/main/java/seng202/group9/GUI/AirportGraphController.java
@@ -1,7 +1,27 @@
 package seng202.group9.GUI;
 
+import javafx.fxml.FXML;
+import javafx.scene.layout.GridPane;
+import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
+
 /**
  * Created by Gondr on 2/10/2016.
  */
-public class AirportGraphController {
+public class AirportGraphController extends Controller{
+    private Dataset dataset;
+    private Session session;
+    @FXML
+    private GridPane chartContainer;
+
+    @Override
+    public void load() {
+        dataset = getParent().getCurrentDataset();
+        session = getParent().getSession();
+    }
+
+    public void goToRawData(){
+        replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
+    }
 }
diff --git a/src/main/java/seng202/group9/GUI/RouteFilterController.java b/src/main/java/seng202/group9/GUI/RouteFilterController.java
index 0aaaa53..eeecf56 100644
--- a/src/main/java/seng202/group9/GUI/RouteFilterController.java
+++ b/src/main/java/seng202/group9/GUI/RouteFilterController.java
@@ -87,8 +87,6 @@ public class RouteFilterController extends Controller {
         alert.setContentText("Your route data has been successfully filtered.");
         alert.showAndWait();
 
-        //currentSession.setFilteredAirlines(FXCollections.observableArrayList(filter.getFilteredData()));
-        //routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
         HashMap<Integer, Integer> routesHM = new HashMap<Integer, Integer>();
         ArrayList<Route> routes = filter.getFilteredData();
         for (int index = 0; index < routes.size(); index++) {
diff --git a/src/main/java/seng202/group9/GUI/RouteGraphController.java b/src/main/java/seng202/group9/GUI/RouteGraphController.java
index 758b48a..8815152 100644
--- a/src/main/java/seng202/group9/GUI/RouteGraphController.java
+++ b/src/main/java/seng202/group9/GUI/RouteGraphController.java
@@ -1,7 +1,27 @@
 package seng202.group9.GUI;
 
+import javafx.fxml.FXML;
+import javafx.scene.layout.GridPane;
+import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.SceneCode;
+import seng202.group9.Controller.Session;
+
 /**
  * Created by Gondr on 2/10/2016.
  */
-public class RouteGraphController {
+public class RouteGraphController extends Controller{
+    private Dataset dataset;
+    private Session session;
+    @FXML
+    private GridPane chartContainer;
+
+    @Override
+    public void load() {
+        dataset = getParent().getCurrentDataset();
+        session = getParent().getSession();
+    }
+
+    public void goToRawData(){
+        replaceSceneContent(SceneCode.ROUTE_RAW_DATA);
+    }
 }