From a857cfb7af9beae3eae69675e6df465b9da6edfc Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sun, 18 Sep 2016 13:59:33 +1200 Subject: [PATCH] Added Redirection to SUmmary pages after Import. --- res/userdb.db | Bin 4370432 -> 4371456 bytes .../java/seng202/group9/Controller/App.java | 7 ++++++- .../java/seng202/group9/GUI/Importer.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/res/userdb.db b/res/userdb.db index f83f4fdea289522eea82a9709b5dc166d60eaa33..470fc21862e3ed6187ce9be5c48850485d115bba 100644 GIT binary patch delta 1978 zcmZXUYfuwc6vyw~8wg^8fykR$KzXc)ib_$ck`17w1ac$~1yKPa&VZET_wJ331PjgjxA{pP!%$taK=)(2F;}5 z9I-Xjsf9>|+L!TMby-z)Le&DHVohbm%Cg85Nh*T6u;#ziL1UO7vp35%+nG`!Bf-J> zMVUFXjYea`{>*ae)8%G)*7wYDRvr}AaDQeI!fOa45MD=! zMuA5vC$cLzs?`fuKPUT0kqy85=?h3A@6+Wc6$Ti{kpYOWYxD183wC=~H@zHqp&= z4o#*U=_Fr~EskiLJi*GZQPNPNCWH~WoDhXcFqv~_=;n|u9hwE7&tLWTZ;j%_6@U7l zS@#M5_8?T3m#1^1CFY0$S=&i5wI|`H9j_gWU#+Bpuc!(}i=n_JS#mOBT5|m(F|Gaa zIoaG}ymghgX0D(&&va`p44o*gN#c}S<(-tDklNMFsb z@J0nN(;Z{$5z5udb1W?o}hKJrAZr4ojb5Y%-DQan_rliuv|&i zuVe+ep0rBq9R-e>ZKB5BHoa}vk%VR5V6I@w&(gZ`FTJqGcB5>(sJZs!Sl6wM@zx6O zLKzF)g(~ejA63mi6g7{U9;9bf@=Lv=%oJwp3q4W(b9jWJ$R-N>X*&D<5Bw5u6r_rJ zl3!#QTJqpTi6~q=`(bfn|HyLdOO|upzR|2VY1MJj9p1gq~Z(oU0c+ z7Fqn`+3@Z~b}_5PA`5F+%P;muEkb^l=j^g1-%;1cMTyy|Pfv|&?2KFF$~;GM9{0j| znK@GG)UGMBukU_5Wv`emVoR;fFRoNcgIz`Udx5#8g8(K?*-mv&%SB%?`}A8=+G|vf zsE@UGWHV?7aYPpUC6J7q%H0JjTd(E+rT zuuj&@wn?ovi4Ea?<(j!|+&pdqC#N@Pt8>=Pz}?gu_a5<%-Zj@;(HA~*_I1SPWb_@Z zy55^E#!2_^ykFe4FzF<}#Fl7^Vw%KL?Hw8SR#q&F@3QgldY4zoH5sy8*R^#(Q)K-h zT|77b%(ZHTVELW!wGwK5#jHjl-(Yk*rf7Fo_7`KPo_XF_*F&$E!-OjDgEMvc z?t|y|qwuJ=O-$MIO=V<#n9GY9+!o?cG^uLo7MH`$QOEez++>ISy1z_DY{ceN_ykqc Fe*uqVG;9C> delta 797 zcmZ9~&r1|x7zgn8oo94+#%6bRXLYUF)pbqRU+Gqwm07!!QjwrZC6b~Gy7-IA*67D2 zvq1Dz>|uz)HUd2;K`c0zVEqs35^T^RZ+nm=i!OQSyA&7=d>-ce%<#SsyzgvoQJDR* zC_K>>H)HA=tTM)gr!}qI{dV}3Q$Z@EIY!@Ujy|OwYCq|TnNVV=_r~p+QB9x_&5Z6f zl5<*AFVYIBR`}bFj^COZzdovmONm-|GScix?`ZA@ve8o77Fi_4F0$g{z6)Jlecinm zlS^mg_>@iCI^L6Dw_QnRO|nx;C`lB(ZY8 zq9|3q^{~XeUcCC9vBXGxEHODU5sytJCMQP5;?}*CF>mwWxbhFj;jPg!J);F$urB3X zv;5C2CT4lurerE*reP&TlB8%fDrbT+%g20{GZp`az+UiY%4IXQDf`U9O*tUvuQR7@ XM%(}I@WbU;*CnPo^GiB0>vaEbQPa=h diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 82274af..c0ae8d6 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -27,6 +27,7 @@ public class App extends Application private Stage primaryStage = null; private VBox mainContainer; private Session session; + private MenuController menuController; public static void main( String[] args ) { @@ -53,7 +54,7 @@ public class App extends Application primaryStage.setResizable(false); primaryStage.setScene(scene); primaryStage.sizeToScene(); - MenuController menuController = (MenuController) loader.getController(); + menuController = (MenuController) loader.getController(); menuController.setApp(this); in.close(); } catch (Exception e) { @@ -180,6 +181,10 @@ public class App extends Application return (Initializable) loader.getController(); } + public MenuController getMenuController() { + return menuController; + } + public Dataset getCurrentDataset(){ return currentDataset; } diff --git a/src/main/java/seng202/group9/GUI/Importer.java b/src/main/java/seng202/group9/GUI/Importer.java index 3be619a..98904fc 100644 --- a/src/main/java/seng202/group9/GUI/Importer.java +++ b/src/main/java/seng202/group9/GUI/Importer.java @@ -30,26 +30,38 @@ public class Importer{ if (scene == SceneCode.AIRLINE_RAW_DATA) { try { showSuccessAlert(parent.getCurrentDataset().importAirline(file.getPath())); + parent.getMenuController().replaceSceneContent(SceneCode.AIRLINE_SUMMARY); } catch (DataException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } } else if (scene == SceneCode.AIRPORT_RAW_DATA) { try { showSuccessAlert(parent.getCurrentDataset().importAirport(file.getPath())); + parent.getMenuController().replaceSceneContent(SceneCode.AIRPORT_SUMMARY); } catch (DataException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } } else if (scene == SceneCode.ROUTE_RAW_DATA) { try { showSuccessAlert(parent.getCurrentDataset().importRoute(file.getPath())); + parent.getMenuController().replaceSceneContent(SceneCode.ROUTE_SUMMARY); } catch (DataException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } } else if (scene == SceneCode.FLIGHT_RAW_DATA) { try { showSuccessAlert(parent.getCurrentDataset().importFlight(file.getPath())); + parent.getMenuController().replaceSceneContent(SceneCode.FLIGHT_SUMMARY); } catch (DataException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } } }