From 6f14fc48f0f6dfcc1916cee73ef8d4f9fbd2c34a Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Tue, 13 Sep 2016 16:23:27 +1200
Subject: [PATCH] Added Raw Data loader for Airline

---
 res/userdb.db                                 | Bin 4336640 -> 4338688 bytes
 .../java/seng202/group9/Controller/App.java   |   4 +++-
 .../seng202/group9/GUI/MenuController.java    |  18 +++++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index b84830c8d31aa01a0c03b0608f1c12300daf8be1..478b2fe9b448203519c712b01f2da19452338f5d 100644
GIT binary patch
delta 877
zcmW;JNoZ3+7zgk-Gimd*sfle&U;1L3q^(`jYPzV^n&mx>YwhB`1hFR%qA1=<-B4-8
ziWa4xC`Jn^;z=1WH3+tPQ1sAR5CS6hpwdIpXf6d&{KtXc3^UBk_kA;G(gXa=%mBZt
z=N(cM$K@e!gdKWvu(Ozbl#h#ltM*=ZFV_34f^)a#*3P9o{V5Lv4gxHY2l-$H73RTw
zC;%H2!UC{^0~SIN6oV5MB~u>P=3DAXW>a!mP_)Z>>e{Tcj2@1<_F4EW|CY>u=K93!
z`6E5pFep3GUy`BzUnv)qfCg?T1sy!F7|Ng=yx;>rR6r$E!4jy38mNUj2tYkFz*1NS
zL1=^~XoeP84l7_Kw8AP_4Q;Rna`}ZJ0@38Jlwofq<~6<KJI@}`yIG@wGS}5uGW0=z
z&6Adl@u$R!2k24e6e=B?-+%4S^HSfO$cPy+&4R3kc|}@GiZ^0Rj53Wmn93Aoj^3(f
zGhN8)8r{$84$6C?YRS-7{UE2?1qk-_i(W$)Dop*U&16oia3DZhp?EydMyI`IyEUWC
zDAP)syzxNG0{8g;zaB##Xf!#c9!bW0<~wG=)JuI?-A6Iu*-iI^Cr-hidSSsU_pASB
zUb<gCs5I5#QKN&)P8u3E>bUHntF;=&trWRov~k%^S4NBgms@DO%#5<lbfD6#W}E0r
zofhMABONa{18f6*_h}I>*He$n=@->9M&m)PhRbzy%CF&;wPXwzH;Q^`(htAZz@<S$
z6Gg2eCZm+OX{_fmLL(JgJ(ppcsL+;sY%HRPx1wKc7cM@<@ADJ9g=N`8c9=zy-Gd9u
znW&Zf=~z=P*L`%fDi>uhb-pOsD8h0NbzdwAi#2jLeZFmkxZFi$2_wkmPU=eJs@XyB
gJ?2`royHTnBDc}sgwe!hH=Vs}7+iMI(ps(gA3w-ZF#rGn

delta 528
zcmWmAF-RL>6bJC{yIjm?5__qMG1u?ZL``eesIh8WHO=KfN*%P&t#!~P)Io487$o3e
zz(vXM&~`|c;-H{pIC~&;caavM(CVf*1T3jr5&UQPz2WhH@aN^P3rhZ1LD`h<EMtL<
zt!SEO59eot{J3%u{4caQeGdDa$E7H`rfX}CvF;cg6mWqGZfF1x2xtT^_`nZM@BlOj
zz(Z(;AcUaBc8u`!XR*Tltlommx1QBvHPlYKN8$JCp2?Wq@GX4KwdV2yWA2^u4CZ$E
z)q2edLn}l;hesg6fHr7{4v0bwI-v`?Ar6n>3G~2I=!HJ$hXf43APhkghT$2Ez$lEt
zb9ezSVH_r45>im_m<H3XIT<ZUyyX2&f2tWnb(NS&xr&H+q%K`YEJFS>soSYD`9Tr*
zgV5u8+%DZ@79zyI*RO;Xqq{3<+Nn!f<SH^BDc5N&Qp#uL>9`_Z+p6EX3lgtpqQ&&5
vd~vDNOT%Ayg3JrAO1D468+$5dop4(IDH62*PrjqSJ}W?{S91Pqw<YcYWIx~_

diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index 57264a2..48b44ce 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -39,6 +39,8 @@ public class App extends Application
 	public void start(Stage primaryStage) {
 		this.primaryStage = primaryStage;
 		try {
+			MenuController menuController = new MenuController();
+			menuController.setApp(this);
 			replaceSceneContent("menu.fxml");//replace this to check your fxml file
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -76,7 +78,7 @@ public class App extends Application
 	 * @return
 	 * @throws Exception
 	 */
-	private Initializable replaceSceneContent(String fxml) throws Exception {
+	public Initializable replaceSceneContent(String fxml) throws Exception {
 		FXMLLoader loader = new FXMLLoader();
 		InputStream in = getClass().getClassLoader().getResourceAsStream(fxml);
 		InputStream menuIn = getClass().getClassLoader().getResourceAsStream("menu.fxml");
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index 96c7d5a..a31e214 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -7,10 +7,11 @@ import javax.swing.JOptionPane;
 
 import javafx.application.Application;
 import javafx.fxml.Initializable;
+import seng202.group9.Controller.App;
 
 public class MenuController implements Initializable{
 
-	Application parent;
+	App parent;
 
 	public void importAirports(){
 		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
@@ -28,13 +29,24 @@ public class MenuController implements Initializable{
 		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
 	}
 
+	/**
+	 * Load Airline Raw Data Function.
+	 */
+	public void loadAirlineRaw(){
+		try {
+			parent.replaceSceneContent("airline_raw_data.fxml");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	public void initialize(URL arg0, ResourceBundle arg1) {
 		// TODO Auto-generated method stub
 		
 	}
 
-	public void setApp(Application parent){
+	public void setApp(App parent){
 		this.parent = parent;
 	}
-	
+
 }