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

Added Enums for each Open View for easier storage for Session.

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-09-16 17:00:25 +12:00
parent ebe82fb6ed
commit d0148d9e73
8 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/Controller/App.java
+6 -2
View File
@@ -28,6 +28,7 @@ public class App extends Application
private Dataset currentDataset = null; private Dataset currentDataset = null;
private Stage primaryStage = null; private Stage primaryStage = null;
private VBox mainContainer; private VBox mainContainer;
private Session session;
public static void main( String[] args ) public static void main( String[] args )
{ {
@@ -40,6 +41,7 @@ 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();
@@ -126,9 +128,9 @@ public class App extends Application
* @return * @return
* @throws Exception * @throws Exception
*/ */
public Initializable replaceSceneContent(String fxml) throws Exception { public Initializable replaceSceneContent(SceneCode fxml) throws Exception {
FXMLLoader loader = new FXMLLoader(); FXMLLoader loader = new FXMLLoader();
InputStream in = getClass().getClassLoader().getResourceAsStream(fxml); InputStream in = getClass().getClassLoader().getResourceAsStream(fxml.getFilePath());
Parent page; Parent page;
try { try {
page = (Parent) loader.load(in); page = (Parent) loader.load(in);
@@ -139,6 +141,8 @@ public class App extends Application
mainContainer.getChildren().remove(1); mainContainer.getChildren().remove(1);
} }
mainContainer.getChildren().add(page); mainContainer.getChildren().add(page);
//change session code to fit with the serialisation
session.setSceneDisplayed(fxml);
return (Initializable) loader.getController(); return (Initializable) loader.getController();
} }
src/main/java/seng202/group9/Controller/SceneCode.java
+14 -2
View File
@@ -4,6 +4,18 @@ package seng202.group9.Controller;
* Created by fwy13 on 16/09/16. * Created by fwy13 on 16/09/16.
*/ */
public enum SceneCode { public enum SceneCode {
INITIAL, AIRLINE_SUMMARY, AIRLINE_RAW_DATA, AIRPORT_SUMMARY, AIRPORT_RAW_DATA, INITIAL(""), AIRLINE_SUMMARY("airline_summary.fxml"), AIRLINE_RAW_DATA("airline_raw_data.fxml"),
ROUTE_SUMMARY, ROUTE_RAW_DATA, FLIGHT_SUMMARY, FLIGHT_RAW_DATA AIRPORT_SUMMARY("airport_summary.fxml"), AIRPORT_RAW_DATA("airport_raw_data.fxml"),
ROUTE_SUMMARY("routes_summary.fxml"), ROUTE_RAW_DATA("route_raw_data.fxml"), FLIGHT_SUMMARY("flight_data_summary.fxml"),
FLIGHT_RAW_DATA("flight_raw_data.fxml");
private String filePath;
SceneCode(String filePath){
this.filePath = filePath;
}
public String getFilePath(){
return filePath;
}
} }
src/main/java/seng202/group9/Controller/Session.java
+10 -1
View File
@@ -6,7 +6,16 @@ import java.io.Serializable;
* Created by fwy13 on 16/09/16. * Created by fwy13 on 16/09/16.
*/ */
public class Session implements Serializable { public class Session implements Serializable {
private SceneCode sceneDisplayed = SceneCode.INITIAL; private SceneCode sceneDisplayed;
public Session(){
//blank constructor
this.sceneDisplayed = SceneCode.INITIAL;
}
public Session(SceneCode scene){
this.sceneDisplayed = scene;
}
public void setSceneDisplayed(SceneCode sceneDisplayed) { public void setSceneDisplayed(SceneCode sceneDisplayed) {
this.sceneDisplayed = sceneDisplayed; this.sceneDisplayed = sceneDisplayed;
src/main/java/seng202/group9/GUI/AirlineSummaryController.java
+5 -4
View File
@@ -7,6 +7,7 @@ import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.control.cell.PropertyValueFactory;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode;
import seng202.group9.Core.Airline; import seng202.group9.Core.Airline;
/** /**
@@ -46,7 +47,7 @@ public class AirlineSummaryController extends MenuController{
public void airlineRawDataButton() { public void airlineRawDataButton() {
try { try {
AirlineRDController rawDataController = (AirlineRDController) AirlineRDController rawDataController = (AirlineRDController)
parent.replaceSceneContent("airline_raw_data.fxml"); parent.replaceSceneContent(SceneCode.AIRLINE_RAW_DATA);
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
} }
@@ -57,7 +58,7 @@ public class AirlineSummaryController extends MenuController{
public void flightSummaryButton() { public void flightSummaryButton() {
try { try {
FlightSummaryController summaryController = (FlightSummaryController) FlightSummaryController summaryController = (FlightSummaryController)
parent.replaceSceneContent("flight_data_summary.fxml"); parent.replaceSceneContent(SceneCode.FLIGHT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.flightPathListView(); summaryController.flightPathListView();
} }
@@ -68,7 +69,7 @@ public class AirlineSummaryController extends MenuController{
public void airportSummaryButton() { public void airportSummaryButton() {
try { try {
AirportSummaryController summaryController = (AirportSummaryController) AirportSummaryController summaryController = (AirportSummaryController)
parent.replaceSceneContent("airport_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRPORT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
@@ -79,7 +80,7 @@ public class AirlineSummaryController extends MenuController{
public void routeSummaryButton() { public void routeSummaryButton() {
try { try {
RouteSummaryController summaryController = (RouteSummaryController) RouteSummaryController summaryController = (RouteSummaryController)
parent.replaceSceneContent("routes_summary.fxml"); parent.replaceSceneContent(SceneCode.ROUTE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
src/main/java/seng202/group9/GUI/AirportSummaryController.java
+5 -4
View File
@@ -7,6 +7,7 @@ import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.control.cell.PropertyValueFactory;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode;
import seng202.group9.Core.Airport; import seng202.group9.Core.Airport;
/** /**
@@ -47,7 +48,7 @@ public class AirportSummaryController extends MenuController{
public void airportRawDataButton() { public void airportRawDataButton() {
try { try {
AirportRDController rawDataController = (AirportRDController) AirportRDController rawDataController = (AirportRDController)
parent.replaceSceneContent("airport_raw_data.fxml"); parent.replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
} }
@@ -58,7 +59,7 @@ public class AirportSummaryController extends MenuController{
public void flightSummaryButton() { public void flightSummaryButton() {
try { try {
FlightSummaryController summaryController = (FlightSummaryController) FlightSummaryController summaryController = (FlightSummaryController)
parent.replaceSceneContent("flight_data_summary.fxml"); parent.replaceSceneContent(SceneCode.FLIGHT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.flightPathListView(); summaryController.flightPathListView();
} }
@@ -69,7 +70,7 @@ public class AirportSummaryController extends MenuController{
public void routeSummaryButton() { public void routeSummaryButton() {
try { try {
RouteSummaryController summaryController = (RouteSummaryController) RouteSummaryController summaryController = (RouteSummaryController)
parent.replaceSceneContent("routes_summary.fxml"); parent.replaceSceneContent(SceneCode.ROUTE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
@@ -80,7 +81,7 @@ public class AirportSummaryController extends MenuController{
public void airlineSummaryButton() { public void airlineSummaryButton() {
try { try {
AirlineSummaryController summaryController = (AirlineSummaryController) AirlineSummaryController summaryController = (AirlineSummaryController)
parent.replaceSceneContent("airline_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
src/main/java/seng202/group9/GUI/FlightSummaryController.java
+5 -4
View File
@@ -11,6 +11,7 @@ import javafx.scene.control.ListView;
import javafx.scene.control.TableView; import javafx.scene.control.TableView;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode;
import seng202.group9.Core.FlightPath; import seng202.group9.Core.FlightPath;
import seng202.group9.Core.FlightPoint; import seng202.group9.Core.FlightPoint;
@@ -66,7 +67,7 @@ public class FlightSummaryController implements Initializable {
public void handleRawDataButton() { public void handleRawDataButton() {
try { try {
FlightRawDataController rawDataController = (FlightRawDataController) FlightRawDataController rawDataController = (FlightRawDataController)
parent.replaceSceneContent("flight_raw_data.fxml"); parent.replaceSceneContent(SceneCode.FLIGHT_RAW_DATA);
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
rawDataController.flightPathListView(); rawDataController.flightPathListView();
@@ -79,7 +80,7 @@ public class FlightSummaryController implements Initializable {
public void airportSummaryButton() { public void airportSummaryButton() {
try { try {
AirportSummaryController summaryController = (AirportSummaryController) AirportSummaryController summaryController = (AirportSummaryController)
parent.replaceSceneContent("airport_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRPORT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
@@ -90,7 +91,7 @@ public class FlightSummaryController implements Initializable {
public void routeSummaryButton() { public void routeSummaryButton() {
try { try {
RouteSummaryController summaryController = (RouteSummaryController) RouteSummaryController summaryController = (RouteSummaryController)
parent.replaceSceneContent("routes_summary.fxml"); parent.replaceSceneContent(SceneCode.ROUTE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
@@ -101,7 +102,7 @@ public class FlightSummaryController implements Initializable {
public void airlineSummaryButton() { public void airlineSummaryButton() {
try { try {
AirlineSummaryController summaryController = (AirlineSummaryController) AirlineSummaryController summaryController = (AirlineSummaryController)
parent.replaceSceneContent("airline_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
src/main/java/seng202/group9/GUI/MenuController.java
+9 -8
View File
@@ -11,6 +11,7 @@ import javafx.scene.layout.BorderPane;
import javafx.stage.Stage; import javafx.stage.Stage;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.SceneCode;
public class MenuController implements Initializable{ public class MenuController implements Initializable{
@@ -37,7 +38,7 @@ public class MenuController implements Initializable{
*/ */
public void viewAirlineRawData() { public void viewAirlineRawData() {
try { try {
AirlineRDController summaryController = (AirlineRDController) parent.replaceSceneContent("airline_raw_data.fxml"); AirlineRDController summaryController = (AirlineRDController) parent.replaceSceneContent(SceneCode.AIRLINE_RAW_DATA);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -47,7 +48,7 @@ public class MenuController implements Initializable{
public void viewAirportRawData() { public void viewAirportRawData() {
try { try {
AirportRDController summaryController = (AirportRDController) parent.replaceSceneContent("airport_raw_data.fxml"); AirportRDController summaryController = (AirportRDController) parent.replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -57,7 +58,7 @@ public class MenuController implements Initializable{
public void viewRouteRawData() { public void viewRouteRawData() {
try { try {
RouteRDController summaryController = (RouteRDController) parent.replaceSceneContent("route_raw_data.fxml"); RouteRDController summaryController = (RouteRDController) parent.replaceSceneContent(SceneCode.ROUTE_RAW_DATA);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -67,7 +68,7 @@ public class MenuController implements Initializable{
public void viewAirlineSummary() { public void viewAirlineSummary() {
try { try {
AirlineSummaryController summaryController = (AirlineSummaryController) parent.replaceSceneContent("airline_summary.fxml"); AirlineSummaryController summaryController = (AirlineSummaryController) parent.replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -77,7 +78,7 @@ public class MenuController implements Initializable{
public void viewAirportSummary() { public void viewAirportSummary() {
try { try {
AirportSummaryController summaryController = (AirportSummaryController) parent.replaceSceneContent("airport_summary.fxml"); AirportSummaryController summaryController = (AirportSummaryController) parent.replaceSceneContent(SceneCode.AIRPORT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -87,7 +88,7 @@ public class MenuController implements Initializable{
public void viewRouteSummary() { public void viewRouteSummary() {
try { try {
RouteSummaryController summaryController = (RouteSummaryController) parent.replaceSceneContent("routes_summary.fxml"); RouteSummaryController summaryController = (RouteSummaryController) parent.replaceSceneContent(SceneCode.ROUTE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} catch (Exception e) { } catch (Exception e) {
@@ -104,7 +105,7 @@ public class MenuController implements Initializable{
*/ */
public void viewFlightSummary() { public void viewFlightSummary() {
try { try {
FlightSummaryController summaryController = (FlightSummaryController) parent.replaceSceneContent("flight_data_summary.fxml"); FlightSummaryController summaryController = (FlightSummaryController) parent.replaceSceneContent(SceneCode.FLIGHT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.flightPathListView(); summaryController.flightPathListView();
} catch (Exception e) { } catch (Exception e) {
@@ -118,7 +119,7 @@ public class MenuController implements Initializable{
public void viewFlightRawData() { public void viewFlightRawData() {
try { try {
FlightRawDataController rawDataController = (FlightRawDataController) FlightRawDataController rawDataController = (FlightRawDataController)
parent.replaceSceneContent("flight_raw_data.fxml"); parent.replaceSceneContent(SceneCode.FLIGHT_RAW_DATA);
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
rawDataController.flightPathListView(); rawDataController.flightPathListView();
src/main/java/seng202/group9/GUI/RouteSummaryController.java
+5 -4
View File
@@ -7,6 +7,7 @@ import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.control.cell.PropertyValueFactory;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode;
import seng202.group9.Core.Route; import seng202.group9.Core.Route;
/** /**
@@ -46,7 +47,7 @@ public class RouteSummaryController extends MenuController{
public void routeRawDataButton() { public void routeRawDataButton() {
try { try {
RouteRDController rawDataController = (RouteRDController) RouteRDController rawDataController = (RouteRDController)
parent.replaceSceneContent("route_raw_data.fxml"); parent.replaceSceneContent(SceneCode.ROUTE_RAW_DATA);
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
} }
@@ -57,7 +58,7 @@ public class RouteSummaryController extends MenuController{
public void flightSummaryButton() { public void flightSummaryButton() {
try { try {
FlightSummaryController summaryController = (FlightSummaryController) FlightSummaryController summaryController = (FlightSummaryController)
parent.replaceSceneContent("flight_data_summary.fxml"); parent.replaceSceneContent(SceneCode.FLIGHT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.flightPathListView(); summaryController.flightPathListView();
} }
@@ -68,7 +69,7 @@ public class RouteSummaryController extends MenuController{
public void airportSummaryButton() { public void airportSummaryButton() {
try { try {
AirportSummaryController summaryController = (AirportSummaryController) AirportSummaryController summaryController = (AirportSummaryController)
parent.replaceSceneContent("airport_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRPORT_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }
@@ -79,7 +80,7 @@ public class RouteSummaryController extends MenuController{
public void airlineSummaryButton() { public void airlineSummaryButton() {
try { try {
AirlineSummaryController summaryController = (AirlineSummaryController) AirlineSummaryController summaryController = (AirlineSummaryController)
parent.replaceSceneContent("airline_summary.fxml"); parent.replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
summaryController.setApp(parent); summaryController.setApp(parent);
summaryController.loadTables(); summaryController.loadTables();
} }