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

Added Redirection to SUmmary pages after Import.

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-09-18 13:59:33 +12:00
parent 8a4134ae4c
commit a857cfb7af
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/userdb.db
BIN
View File
Binary file not shown.
src/main/java/seng202/group9/Controller/App.java
+6 -1
View File
@@ -27,6 +27,7 @@ public class App extends Application
private Stage primaryStage = null; private Stage primaryStage = null;
private VBox mainContainer; private VBox mainContainer;
private Session session; private Session session;
private MenuController menuController;
public static void main( String[] args ) public static void main( String[] args )
{ {
@@ -53,7 +54,7 @@ public class App extends Application
primaryStage.setResizable(false); primaryStage.setResizable(false);
primaryStage.setScene(scene); primaryStage.setScene(scene);
primaryStage.sizeToScene(); primaryStage.sizeToScene();
MenuController menuController = (MenuController) loader.getController(); menuController = (MenuController) loader.getController();
menuController.setApp(this); menuController.setApp(this);
in.close(); in.close();
} catch (Exception e) { } catch (Exception e) {
@@ -180,6 +181,10 @@ public class App extends Application
return (Initializable) loader.getController(); return (Initializable) loader.getController();
} }
public MenuController getMenuController() {
return menuController;
}
public Dataset getCurrentDataset(){ public Dataset getCurrentDataset(){
return currentDataset; return currentDataset;
} }
src/main/java/seng202/group9/GUI/Importer.java
+12
View File
@@ -30,26 +30,38 @@ public class Importer{
if (scene == SceneCode.AIRLINE_RAW_DATA) { if (scene == SceneCode.AIRLINE_RAW_DATA) {
try { try {
showSuccessAlert(parent.getCurrentDataset().importAirline(file.getPath())); showSuccessAlert(parent.getCurrentDataset().importAirline(file.getPath()));
parent.getMenuController().replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} }
} else if (scene == SceneCode.AIRPORT_RAW_DATA) { } else if (scene == SceneCode.AIRPORT_RAW_DATA) {
try { try {
showSuccessAlert(parent.getCurrentDataset().importAirport(file.getPath())); showSuccessAlert(parent.getCurrentDataset().importAirport(file.getPath()));
parent.getMenuController().replaceSceneContent(SceneCode.AIRPORT_SUMMARY);
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} }
} else if (scene == SceneCode.ROUTE_RAW_DATA) { } else if (scene == SceneCode.ROUTE_RAW_DATA) {
try { try {
showSuccessAlert(parent.getCurrentDataset().importRoute(file.getPath())); showSuccessAlert(parent.getCurrentDataset().importRoute(file.getPath()));
parent.getMenuController().replaceSceneContent(SceneCode.ROUTE_SUMMARY);
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} }
} else if (scene == SceneCode.FLIGHT_RAW_DATA) { } else if (scene == SceneCode.FLIGHT_RAW_DATA) {
try { try {
showSuccessAlert(parent.getCurrentDataset().importFlight(file.getPath())); showSuccessAlert(parent.getCurrentDataset().importFlight(file.getPath()));
parent.getMenuController().replaceSceneContent(SceneCode.FLIGHT_SUMMARY);
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} }
} }
} }