fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michael Wilson
2016-09-17 14:58:18 +12:00
parent eb698f17c8 8027b701a0
commit 8b30d2c0c2
4 changed files with 86 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/Controller/App.java
+8 -35
View File
@@ -32,7 +32,12 @@ public class App extends Application
{
launch(args);
}
/**
public Stage getPrimaryStage() {
return primaryStage;
}
/**
* Starts the application
* @param primaryStage main "stage" of the program
*/
@@ -62,6 +67,7 @@ public class App extends Application
e.printStackTrace();
}
/*
AirlineFilter filter = new AirlineFilter(currentDataset.getAirlines());
filter.filterName("NZ");
@@ -119,40 +125,7 @@ public class App extends Application
Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.load();
controller.loadOnce();/*
if (session.getSceneDisplayed() == SceneCode.AIRLINE_RAW_DATA){
Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.load();
}else if (session.getSceneDisplayed() == SceneCode.AIRLINE_SUMMARY){
Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.load();
}else if (session.getSceneDisplayed() == SceneCode.AIRPORT_RAW_DATA){
AirportRDController controller = (AirportRDController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.AIRPORT_SUMMARY){
AirportSummaryController controller = (AirportSummaryController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.ROUTE_RAW_DATA){
RouteRDController controller = (RouteRDController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.ROUTE_RAW_DATA){
RouteSummaryController controller = (RouteSummaryController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.FLIGHT_RAW_DATA){
FlightRawDataController controller = (FlightRawDataController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.FLIGHT_SUMMARY){
FlightSummaryController controller = (FlightSummaryController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.flightPathListView();
}*/
controller.loadOnce();
objectIn.close();
fileIn.close();
}catch(IOException e){