From e3ff9d3bfc9374ac5d1e0159e41363696e8a1b4e Mon Sep 17 00:00:00 2001
From: Sunguin Peng <spe76@uclive.ac.nz>
Date: Sat, 17 Sep 2016 11:52:07 +1200
Subject: [PATCH] Fixed a bit of Airline GUI

---
 res/session.ser                                 | Bin 210 -> 211 bytes
 .../seng202/group9/GUI/AirlineRDController.java |   6 +++---
 .../java/seng202/group9/GUI/MenuController.java |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/session.ser b/res/session.ser
index dc7bbffef7536925ee93cc6b78360d2aeb9284e0..98ddf26d989515a3be7c9079dd872e162cfc2e7a 100644
GIT binary patch
delta 24
fcmcb_c$sm+AwdC0&mbR9KiBvm$MAR;#}G#VYIFzT

delta 23
ecmcc2c!_bsApw3jA5V9WkoX|S@OT%;5Jv!Fz6Y5A

diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java
index 6357a10..9dc01a7 100644
--- a/src/main/java/seng202/group9/GUI/AirlineRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java
@@ -86,10 +86,10 @@ public class AirlineRDController extends Controller {
     public void load() {
         airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
         airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
-        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
+        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
         //Need to check IATA and ICAO
-        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
-        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
         airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
         airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CountryName"));
         airlActivecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index 7618dc9..1f359ec 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -32,7 +32,7 @@ public class MenuController extends Controller{
 	 * Load Airline Raw Data Function.
 	 */
 	public void viewAirlineRawData() {
-		replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
+		replaceSceneContent(SceneCode.AIRLINE_RAW_DATA);
 	}
 
 	public void viewAirportRawData() {