From 6ec38bcb87208eeeafefc7aafc483924995d03d4 Mon Sep 17 00:00:00 2001 From: Liam Beckett Date: Sat, 1 Oct 2016 15:31:28 +1300 Subject: [PATCH] Fixed the error when the user clicks on empty path fields in the flight path list view --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../java/seng202/group9/Core/FlightPath.java | 2 +- .../group9/GUI/FlightRDController.java | 30 ++++++++++++------ .../group9/GUI/FlightSummaryController.java | 14 ++++---- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index e70283afa54547c7448d691322529974ffda20b1..6476a058bd99e7a0fd547c243d02868e9f13272b 100644 GIT binary patch delta 1084 zcmZwCZERCz7zW_eZuG3hv5tvuv`o~=S()s^vb9y9=kzcrjPWrx3Ip|VP!JGi2UB+f%+_|6k zee$;5{U@yrx*VqVZl`W)f18+0OlGDurgWxBOco}YDTB$%WMi7l^Z-*P(-fvGCOcC$ z(^RG$rU#j(F+IfeFjFp59@BIt2a}U&22(!MBTO@y9%Xur>2an4rYD$Y4U%%yKSh$V zqcINTN(Ne_Iu={CcVHT=W0W zxqV(Wa{Iu*)F0o!KWA6N-8sL<&RhJq!%cRZ8Z(Q-s#4_hm@}=}#vZe=$EpX{tf;{j zQZOFExn2}%N`ByI;+<3TTRY>G<$n*C z9QjEN7g-9fl{nRn>X|PKqSu|lhv{Y)psGiSV2$HlFoB|{<_z>#bD8?N5-i$P=R z)V8(XLjk;1Uec`TVJ~PhPZ2lvq#K*CqqF|k#rTyU+uJ> z_+;#g*q%gla&JfTWQ#6(jSzE>b{?$XzbBP+!E7jkCt(g0LkW~Z89W7Um<#1l0Uq#z z51xi+U>?ke1>gr2GzfqW3!xGg!D0x)5?BgVunekUIjn${unKBmHPk{Ktbq`$g>_I5 z>tO>t3(vvxK=1-Iz(&{vVb}~?;6>O9+h9Aq1Uq0SG{VaefhO1myWtgh6{7GOybf=` Qo6rm`(0V+Td@C>aU)6j1L;wH) delta 1065 zcmX}keN5DK90%~<9eTez6gav>@zC-ieq2X9i02&@^1J(aa)}A@V2BTWhz_3;0f`GA zcrZR7{?V{y-`Jp~8%oKXmf%z(S|;JtvOl!ebSJElt8~t})XnMp*IM6wUw^#!`F!3@ z51vFcL5JOtvp+#IEbm?D{`FimBOVv1&pVX`vCGCjj& zV|tcp8dDt8bfy_h@k}$B>`VzvvzTTxJ;(Gs(;TL`O!JuLGrho+*iXu#?C23GMk<%^ zZyS=NE@4%b0;|Psh_XzRY?93^<5@(ts>H`y)!=^HUjvs+YIQhWHIC+rbE@JjlO##e zcVo<0Hd|JdY5{M4QQEM7Xj$fkUH>0>j8T?Yz0#;x8nnQwyn+Sk9z%zE@b{L^dCm31 z{^8bv-A!gS*b(~kQRXMv_k%UoNOiy{lDx`n-@(4RmMQL8!+zJ}uTwv}rUsp+`PWku z)Nik>W z(+7!nf>jj{MY@K;iOW@AUa^P7HcfHKhZBdKSMz$rQ9XQk`mpgvaeLc@ra;oE3C&T_ zC3hTeT>6E5yC@1fGUVRmKvw&e9`Qlg;W5QszctqA6&J$}x7_=^Gsl`YRYcxI=-kun z@pd~!Ko5I2G}N5`^sH#Ti4%Y8ueLp##5sM?HTle;aLI@;jv@4wCjS<-Z$zki=sy~& zcjwL&4Py?Me60P4BL}{_AkOHMBZK=!KOTK39_V3Ypl#(pgC%0oxFbdWs;}5nf1^@t z8OP-8j(dT~?m_Xn9{S7H-R)L>Y?~N&z>DC7WOxZuAQjRe9Tq?aECd%U0ylUd6JCZ_ z;8nqmArwI|tb#Y71Xe>Stbw(# z4%Wk)Ku`v6K{>n)L8yQYun{)FX4nGnz*eY)ZBPZ(Py^ec7T$$A2*G<$4?AEd?1J6U LaB5<_F@DBVz*g{- diff --git a/src/main/java/seng202/group9/Core/FlightPath.java b/src/main/java/seng202/group9/Core/FlightPath.java index 0f29d90..70539e4 100644 --- a/src/main/java/seng202/group9/Core/FlightPath.java +++ b/src/main/java/seng202/group9/Core/FlightPath.java @@ -28,7 +28,7 @@ public class FlightPath { } /** - * COnstructor for FlightPath from dataset add later the ID needs to be set from database. + * Constructor for FlightPath from dataset add later the ID needs to be set from database. * @param departureAirport * @param arrivalAirport */ diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index d3a42c0..25ab2dd 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -92,17 +92,19 @@ public class FlightRDController extends Controller { flightPathListView.setOnMouseClicked(new EventHandler() { public void handle(MouseEvent event) { String flightPathDisplayNameClicked = flightPathListView.getSelectionModel().getSelectedItem(); - String[] segments = flightPathDisplayNameClicked.split("_"); - String pathIdClicked = segments[0]; + if (flightPathDisplayNameClicked!=null) { + String[] segments = flightPathDisplayNameClicked.split("_"); + String pathIdClicked = segments[0]; - currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() - .get(Integer.parseInt(pathIdClicked))); - currentPathId = Integer.parseInt(pathIdClicked); + currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() + .get(Integer.parseInt(pathIdClicked))); + currentPathId = Integer.parseInt(pathIdClicked); - ArrayList flightPaths; - flightPaths = theDataSet.getFlightPaths(); - ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); - flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + ArrayList flightPaths; + flightPaths = theDataSet.getFlightPaths(); + ArrayList flightPoints = flightPaths.get(currentPathIndex).getFlight(); + flightTableView.setItems(FXCollections.observableArrayList(flightPoints)); + } } }); @@ -246,6 +248,9 @@ public class FlightRDController extends Controller { flightPathListView(); } + /** + * Function for the 'Move Up' right click option on the points in the flight table. + */ public void movePointUp(){ FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); @@ -258,9 +263,11 @@ public class FlightRDController extends Controller { } updateTable(currentPathIndex); updatePaths(); - } + /** + * Function for the 'Move Down' right click option on the points in the flight table. + */ public void movePointDown(){ FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); @@ -287,6 +294,9 @@ public class FlightRDController extends Controller { flightTableView.refresh(); } + /** + * Updates the flight path list view so that it displays the correct names for the paths + */ private void updatePaths(){ try { flightPathListView.getItems().clear(); diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index c5a99f4..12f8c86 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -158,12 +158,14 @@ public class FlightSummaryController extends Controller { flightPathListView.setOnMouseClicked(new EventHandler() { public void handle(MouseEvent event) { String flightPathDisplayNameClicked = flightPathListView.getSelectionModel().getSelectedItem(); - String[] segments = flightPathDisplayNameClicked.split("_"); - String pathIdClicked = segments[0]; - - currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() - .get(Integer.parseInt(pathIdClicked))); - currentPathId = Integer.parseInt(pathIdClicked); + if (flightPathDisplayNameClicked!=null) { + String[] segments = flightPathDisplayNameClicked.split("_"); + String pathIdClicked = segments[0]; + + currentPathIndex = theDataSet.getFlightPaths().indexOf(theDataSet.getFlightPathDictionary() + .get(Integer.parseInt(pathIdClicked))); + currentPathId = Integer.parseInt(pathIdClicked); + } } }); flightPathListView.setItems(flightList);