diff --git a/res/session.ser b/res/session.ser index dc7bbff..98ddf26 100644 Binary files a/res/session.ser and b/res/session.ser differ 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("ID")); airlNamecol.setCellValueFactory(new PropertyValueFactory("Name")); - airlAliascol.setCellValueFactory(new PropertyValueFactory("ICAO")); + airlAliascol.setCellValueFactory(new PropertyValueFactory("Alias")); //Need to check IATA and ICAO - airlIATAcol.setCellValueFactory(new PropertyValueFactory("Alias")); - airlICAOcol.setCellValueFactory(new PropertyValueFactory("IATA")); + airlIATAcol.setCellValueFactory(new PropertyValueFactory("IATA")); + airlICAOcol.setCellValueFactory(new PropertyValueFactory("ICAO")); airlCallsigncol.setCellValueFactory(new PropertyValueFactory("CallSign")); airlCountrycol.setCellValueFactory(new PropertyValueFactory("CountryName")); airlActivecol.setCellValueFactory(new PropertyValueFactory("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() {