From 19ee2d2fff42f68dd0a4a79302430f7c689bd7e0 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Mon, 12 Sep 2016 14:40:18 +1200
Subject: [PATCH] Moved files around to get resources folder for maven

---
 res/userdb.db                                 | Bin 4297728 -> 4299776 bytes
 .../java/seng202/group9/GUI/MainMenuBar.java  |   2 +-
 .../GUI => resources}/airline_raw_data.fxml   |   0
 .../GUI => resources}/airport_raw_data.fxml   |   0
 .../flight_data_summary.fxml                  |   0
 .../GUI => resources}/flight_raw_data.fxml    |   0
 .../group9/GUI => resources}/menu.fxml        |   0
 .../GUI => resources}/route_raw_data.fxml     |   0
 src/main/resources/userdb.db                  |   0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename src/main/{java/seng202/group9/GUI => resources}/airline_raw_data.fxml (100%)
 rename src/main/{java/seng202/group9/GUI => resources}/airport_raw_data.fxml (100%)
 rename src/main/{java/seng202/group9/GUI => resources}/flight_data_summary.fxml (100%)
 rename src/main/{java/seng202/group9/GUI => resources}/flight_raw_data.fxml (100%)
 rename src/main/{java/seng202/group9/GUI => resources}/menu.fxml (100%)
 rename src/main/{java/seng202/group9/GUI => resources}/route_raw_data.fxml (100%)
 create mode 100644 src/main/resources/userdb.db

diff --git a/res/userdb.db b/res/userdb.db
index 3f85ae9de633897388863e49e729032bea36a287..aea76cac86081572f9baa9e8543ac16c0caf32dc 100644
GIT binary patch
delta 798
zcmYk(OGwl~90%}uth%ea>$=Zz*T?F%x=%OPM?N-nK|v3pl?RIg^<bwJFOhU8CD0-$
zWuYH}P)kBW!RTo%vm!6uJOo~Xpo;`SMeLzV(Dx4=8u-l2VP?L}@3*wQB9``6#9E+i
zk}=1%_23|%+?^hG@xq-Q*XoXog8&I8D1&mS05e#i5~{!oHn2lAIG_fcV7%o9PjScP
zo!m0#xRn`!^lqXen4foV(uX~-pMFkTOvRHu?^Pk^9*@z=W%sPbF{c|DE4S&@-F<Iy
zci(q$!8F5uGYVdb-=NzGRh@sa=*s7w#3;SVlQi_X(nKY{d8{~62&{2R`jmstJq=7y
zS4thloh-rRM_G`wvPm3^4UrSQqKY5#yZjOlv#;z8+h9{H5!H4&j;WZ?Hu~PA28FiL
zjMv>PTXhv>O0HJfrz`1Jv+5VxLfJ>IcA3y-`q8YCLRZlGk+VmR=yI|@bB@TkE~7$7
zC4@H7QAo9~=F$pk!4CnbgL-IyMhHR^G(!kZK^R(~6(SIY7{nm~Noa!<oCYH&4IR)4
zUC<3@pa*)P5BebkXJG&aVW^l(XY(_?HuR~6bu;-=uFDA-5+~x7cp#>PhkxN)e42M~
z&fc?S9QkjI>P8xW>l>8=x`EE$^9{(1uBY)uUq+^M9Yx~4l#J;BZMUen(0+P;-J3;0
zYw2dhD5#?NFHgH1(mwhYQCXqA)D~5pLVIW;X!OKQYf)o$(d(#j!AY3|cMNGY^yk1m
zAj8^0pYFTEa#&Z>!<ZVj8vhWIm^_qJTrQdGd2y{|w*Q+6`wKFvn`j}e;yg(6Vb%8+
D(joS~

delta 425
zcmXBMJxfAS0LJli&b{i*G_`9tU+Y??m1bt|FXoM=rVN{+pn|4QqNOoI(A97_1VRK2
z4Gjju5o~B|587&qXbt=TJ<{;|PY+MARc6J9GOPMcIYOK#*LsHLo({KFS}HZvN<*c<
zKmr*|U<L~)&;wTJ1sm9*4;<hG7xY8-%MAmfp=!JL$|<!GLd<sllC|iyg1gRNTbfUP
zGzbyjE$x6w=eJwDyyq@dnr%%q+k@FNd6WJSuJ6Y#_+{MV5LX=~NO|&EPIKeaD)TR|
z@+&?Po+x!$Se{64(w%fHh1fg0VSFbX35aS(>7)PUMxE-Fe98k}@PQu!5QHHZhVCW=
zBQOeK7=s8zVH_r45@HaCDM-LHBw+?pFbi`q4-2peORx+punKFChIPn*A@Zq>+R-2A
CtBpkf

diff --git a/src/main/java/seng202/group9/GUI/MainMenuBar.java b/src/main/java/seng202/group9/GUI/MainMenuBar.java
index 0fc953f..489fdb7 100644
--- a/src/main/java/seng202/group9/GUI/MainMenuBar.java
+++ b/src/main/java/seng202/group9/GUI/MainMenuBar.java
@@ -14,7 +14,7 @@ public class MainMenuBar{
 		
 	public Parent getmenuBar(){
 		try{
-			Parent menuPane = FXMLLoader.load(getClass().getResource(menuFXML));
+			Parent menuPane = FXMLLoader.load(getClass().getClassLoader().getResource(menuFXML));
 			return menuPane;
 		}catch (Exception e){
 			e.printStackTrace();
diff --git a/src/main/java/seng202/group9/GUI/airline_raw_data.fxml b/src/main/resources/airline_raw_data.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/airline_raw_data.fxml
rename to src/main/resources/airline_raw_data.fxml
diff --git a/src/main/java/seng202/group9/GUI/airport_raw_data.fxml b/src/main/resources/airport_raw_data.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/airport_raw_data.fxml
rename to src/main/resources/airport_raw_data.fxml
diff --git a/src/main/java/seng202/group9/GUI/flight_data_summary.fxml b/src/main/resources/flight_data_summary.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/flight_data_summary.fxml
rename to src/main/resources/flight_data_summary.fxml
diff --git a/src/main/java/seng202/group9/GUI/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/flight_raw_data.fxml
rename to src/main/resources/flight_raw_data.fxml
diff --git a/src/main/java/seng202/group9/GUI/menu.fxml b/src/main/resources/menu.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/menu.fxml
rename to src/main/resources/menu.fxml
diff --git a/src/main/java/seng202/group9/GUI/route_raw_data.fxml b/src/main/resources/route_raw_data.fxml
similarity index 100%
rename from src/main/java/seng202/group9/GUI/route_raw_data.fxml
rename to src/main/resources/route_raw_data.fxml
diff --git a/src/main/resources/userdb.db b/src/main/resources/userdb.db
new file mode 100644
index 0000000..e69de29