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

Loaded Observers to Session loading

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-09-16 17:23:06 +12:00
parent bf8c1d1fdf
commit 5641cc3728
3 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/session.ser
BIN
View File
Binary file not shown.
src/main/java/seng202/group9/Controller/App.java
+53 -5
View File
@@ -14,7 +14,7 @@ import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.BorderPane; import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.Stage; import javafx.stage.Stage;
import seng202.group9.GUI.MenuController; import seng202.group9.GUI.*;
/** /**
* Main Application frame of the Flight Data Analyser. * Main Application frame of the Flight Data Analyser.
@@ -39,7 +39,6 @@ public class App extends Application
@Override @Override
public void start(Stage primaryStage) { public void start(Stage primaryStage) {
this.primaryStage = primaryStage; this.primaryStage = primaryStage;
this.session = new Session();
//load the menu and the first container //load the menu and the first container
try { try {
FXMLLoader loader = new FXMLLoader(); FXMLLoader loader = new FXMLLoader();
@@ -50,7 +49,7 @@ public class App extends Application
primaryStage.sizeToScene(); primaryStage.sizeToScene();
MenuController menuController = (MenuController) loader.getController(); MenuController menuController = (MenuController) loader.getController();
menuController.setApp(this); menuController.setApp(this);
//replaceSceneContent("flight_raw_data.fxml");//replace this to check your fxml file in.close();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -63,11 +62,12 @@ public class App extends Application
e.printStackTrace(); e.printStackTrace();
} }
/*
AirlineFilter filter = new AirlineFilter(currentDataset.getAirlines()); AirlineFilter filter = new AirlineFilter(currentDataset.getAirlines());
filter.filterName("NZ"); filter.filterName("NZ");
filter.filterAlias("flight"); filter.filterAlias("flight");
filter.printFilter(); filter.printFilter();
/*
//testout single route adding //testout single route adding
try { try {
currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW"); currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW");
@@ -111,7 +111,55 @@ public class App extends Application
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
}*/ }*/
//after all loading then load the previous session
try{
FileInputStream fileIn = new FileInputStream("res/session.ser");
ObjectInputStream objectIn = new ObjectInputStream(fileIn);
session = (Session) objectIn.readObject();
if (session.getSceneDisplayed() == SceneCode.AIRLINE_RAW_DATA){
AirlineRDController controller = (AirlineRDController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}else if (session.getSceneDisplayed() == SceneCode.AIRLINE_SUMMARY){
AirlineSummaryController controller = (AirlineSummaryController) replaceSceneContent(session.getSceneDisplayed());
controller.setApp(this);
controller.loadTables();
}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();
}
objectIn.close();
fileIn.close();
}catch(IOException e){
session = new Session();
e.printStackTrace();
}catch(ClassNotFoundException e){
System.out.println("Missing Session Class");
System.exit(1);
} catch (Exception e) {
e.printStackTrace();
}
} }
/** /**
src/main/java/seng202/group9/Controller/Session.java
+4
View File
@@ -20,4 +20,8 @@ public class Session implements Serializable {
public void setSceneDisplayed(SceneCode sceneDisplayed) { public void setSceneDisplayed(SceneCode sceneDisplayed) {
this.sceneDisplayed = sceneDisplayed; this.sceneDisplayed = sceneDisplayed;
} }
public SceneCode getSceneDisplayed() {
return sceneDisplayed;
}
} }