From e51aaaa7f2abceb5f9750c29f0b9d7d0c318ea84 Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Sat, 1 Oct 2016 16:43:28 +1300
Subject: [PATCH] Fixed bug with flight pages and an empty dataset

---
 res/userdb.db                                 | Bin 8387584 -> 8387584 bytes
 .../group9/GUI/FlightRDController.java        |  44 ++++++++------
 .../group9/GUI/FlightSummaryController.java   |  57 +++++++++---------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index 6476a058bd99e7a0fd547c243d02868e9f13272b..4f6d70cd15c7450aac0aae5a6333850c37560112 100644
GIT binary patch
delta 2187
zcmbu>UrbY190%}o@44JU6$*071<GhEpsf_K15xH+K>6bo6tSqVVFAme8&U`L50io5
zcKR@vC@%DA$sU$%3E7tD;tdH)w&?qKBtZw+l<mQ|EYrm}Huf#h^$)TaA3nG3x#xF!
ze!u(cNiRNGq8H(cA>}e5#wAb*Nq(OY`HQQzBJ*WZu&^PH5Tc=XaaG#rU-VD<JAFWZ
zp+C{PbS98eVg2Stu`nSfYE!L*Xp?hr*_eIp0ZrFZI!)+fI!C8fOuI=9>FM!QpG1kh
z_Fz+@juLadr{h$=$=TKKyEdoEL%>5qpVCM4VK88xn&PM+=ybuWBn7XcsKqvx*PX_?
zkAu@xnwdd&rBS<pRhyHjSqQJHyD_ITNrG;aaVBskaz;6mIE&*<=1jv`JZA}<X*t`#
z*+$M1IZNV9$5}FGDV%NMER{3F>N!i}OyMk@vkcBMKVt^>%^8a<`Q<?aWWfuN4Ms45
z88$-><U$^7QRTs{|9nj)@<i3xEKhZMq!UN%M7$@C2_Fh|c<U$rtCfa^(bOD`Vz-Nz
z4*EJed%D6oxhg$<r@ei?wIf=uqp7CSSz~fmR@K*-+QTyfA0N|a1%9;Yzm%&t%gRxE
zz}~7)9}Z6lF52Vi?Q+@Ij%m|IMf1vD3ZAi-VA$Fq`H%JX68frkQ(&M)|CQWml9dx>
z!3}LwJIgKQ!dUek^-hH)SCg42wi2045b?NhR?H+5!VX$O+EA-|0dsqTL$2Q@E3VQt
zxzzS}PImiTjUB%3sC**EjSC~<*5#Z=*5u^yp6T`V4MgO$I+8uVZcdIsb%LctuC_e0
zxU2C|n^_$*ULP^%X_WkYapYWVaUC9C)GqKbJ7@hZ;C8#o(jJU*9q0%YYb_0O`4(9@
zl)qddTVz7PIgyV#7?k~k_$iU9bN@@BHzH!S>7s&G$CM*z;<4xH)ka&W1)_Q~^t`;D
zUSEIIH%Hx(=SJ$R8l|*U9NijQ!q7ytLPRnVqsCj&1=WV91wJTh8BnEq%VMgaRfQ`C
zD)}Y1MU~vvzYm8#Pg(ua)HcWm8x+8HD1;qghZms;ieV>|z%JMgrSKB$ftR5S%Hb8L
zfJ&$W2UJ51)IuHXg;!x8?1y@2fCF$48sQK$!C`PhGaP}Va12_Y6<$-Nsn-_+<DaBR
zs^n~2G;B%~C7ex@gkBe0#dtC)d>1_JKi@wp6=;;gLh;hh*lIU<&-l9f!xeO`49NGR
zYaE^sc-pF;lB>4MN^{|IlkN!LTMdqS?knqQGth9-^ES<BbG}9?D-++_6Pre;J(l|}
zVnb2m*+;@jCB>Y!-%nbXA`hp?tU`<Y@8NWFZ;K%Lh4XE299+;29nc9UzztpS2AqU$
z@W7k!7WBX==mjsFhPR;)`oRZh;4GX|h4bf^X2)-rNm)cfb%}8SZpFM__nVvps>%7z
z{LjH(#O@1Aj`7{Q@T(ZS0E6(ZDh&=T){Xy~gf6;0M49kNjh`9XM@7XQaLx{KS#jgf
Y#eH>tb|}}TN*@hRO6s>8haJED3&&5)cK`qY

delta 1339
zcmZXUT}%{L6oBu{9d?%mm!G}M!Y)6HLK*(l1zM>se?_Dq1-h)%UEN(!sHNp!v|2|h
zNDfbsR#K)(lcw~+m%cQiVP1}j{dwTcq<tZgxTGffV%jv()=(OH28d~F?tCZb%)RH_
zbMD{uXWRTb@rgHWhOxYD#&WwEOZ|*7%hIQ1mH9KQ{9#f8V=RF`B56<MfAc^2AN(<Y
z#DC>$d`(ZQD*kS{O8Q3L#}bOn5hWy&a~2-+OuNkEj6daZzG~3074FT<v~ib%Gyn09
zz{&QOV6dqx*wWtI(cTtXh+7NE;R)lL{0aZfblBj&1TIMqhba}sl(KB6G<M>~De_Zu
zn87_+{744(OaG7RSdORo6v;6yKu92D5FCU8A_0U2gcXDhL?Q?~h$IlnAohW9fJgz6
z3L*_eItV8S@^yj80O1Ca2_g%G=a%sHC7bJFX3SXD>~gY@CBre$|4>dQJNAW#<mtIf
zpm{;d1}z7)T+s4B^MRHR+J4XufK~unA!skHXhq7moJ*$+Yni&4;^JR3F8wUiHzQX_
zqf#A<v6w!VYCY--7g*dw%`zJp?(4sNVJt}I`3Bt|2$v={42+MCj8DY;3*V<ZGxsdJ
zbJ~+{bvHD~H)<w&&kpvRomT1`92nlwO*d1w#PubAC|@59xe7#3HN!riWpH3BR;=e&
zhH~VdGX1NraMWhch~`?{V<&Wf*j1v(4yiW%aJi~lI(-)Rxtg87#t*e>tz@IsVJte*
zvXi7<Ul~f$x8@`JZysAW*6Y;*t7JE%Rd0e~SlZN0=gMl5qRc9Ns-g51|I_7>?=V^F
zWKt*plDD#7s9j@TYK-Z3<|9$_F#NTf?QZ<ixkzEkl&5H?<f;FZ+&FS^cw+pDS$^W4
zo_lwvWcQxg<5PR~)L47(P`}YR7a5f-G{gNDvu~FJ2laWInyufj2s!mLfpEU!j_j?C
zY|j8J1}p(A1uO$B2RsOP2=FkVAFu+j60i#JWx!Vej{sH!z6y90@HN2K0c!wj0qX$k
z0UH3{0Bi(22G|669IzSiO~4kwR=^X0ZGdk9wgYwmb^^W)7y#@73<916>;`-X@DyMO
zFbsJ57M}ThaVuRhlwf4byI37HHFZsyU7v^$Q6fh45WU1%;vCUO^b_wA=ZW`-0pfk)
z17eUEB8G_(Vw4yo#)%8W1aXnLM0{whPh2jD`{=bXXl;||#W_H15O?X{kBqq^ME9&O
zc*XDqKiYV(m|0C}R$tv}l<c#Tc9qbGYlfsvZa3fDpw6ErxsaY2wzbJtF59#8;Jrz(
zSmN{&IgO2blLcjl(iv7|>BU`3b4RAL%dPIZI{8M^^ZTJM1;Tl<yL<OWJP3qQ+CBEP
QwTsoB+s5tWj~jpg7nWwlt^fc4

diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java
index 53dbfa1..a55939a 100644
--- a/src/main/java/seng202/group9/GUI/FlightRDController.java
+++ b/src/main/java/seng202/group9/GUI/FlightRDController.java
@@ -115,26 +115,28 @@ public class FlightRDController extends Controller {
      * Used to load the table for the Flight points initially from the MenuController
      */
     public void load() {
-        theDataSet = getParent().getCurrentDataset();
-        try {
-            currentPathId = theDataSet.getFlightPaths().get(0).getID(); //Sets the default to the 1st Path
-        } catch (DataException e) {
-            e.printStackTrace();
-        }
-        flightIdCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("ID"));
-        flightNameCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Name"));
-        flightTypeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Type"));
-        flightAltitudeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Altitude"));
-        flightLatCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Latitude"));
-        flightLongCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Longitude"));
-        flightHeadCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Heading"));
-        flightLegDisCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("LegDistance"));
-        flightTotDisCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("totalDistance"));
+        if (theDataSet != null) {
+            theDataSet = getParent().getCurrentDataset();
+            try {
+                currentPathId = theDataSet.getFlightPaths().get(0).getID(); //Sets the default to the 1st Path
+            } catch (DataException e) {
+                e.printStackTrace();
+            }
+            flightIdCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("ID"));
+            flightNameCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Name"));
+            flightTypeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Type"));
+            flightAltitudeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Altitude"));
+            flightLatCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Latitude"));
+            flightLongCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Longitude"));
+            flightHeadCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Heading"));
+            flightLegDisCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("LegDistance"));
+            flightTotDisCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("totalDistance"));
 
-        ArrayList<FlightPath> flightPaths;
-        flightPaths = theDataSet.getFlightPaths();
-        ArrayList<FlightPoint> flightPoints = flightPaths.get(0).getFlight();
-        flightTableView.setItems(FXCollections.observableArrayList(flightPoints));
+            ArrayList<FlightPath> flightPaths;
+            flightPaths = theDataSet.getFlightPaths();
+            ArrayList<FlightPoint> flightPoints = flightPaths.get(0).getFlight();
+            flightTableView.setItems(FXCollections.observableArrayList(flightPoints));
+        }
     }
 
     /**
@@ -318,7 +320,9 @@ public class FlightRDController extends Controller {
 
     @Override
     public void loadOnce(){
-        flightPathListView();
+        if (theDataSet != null) {
+            flightPathListView();
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java
index 12f8c86..f683c61 100644
--- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java
@@ -177,36 +177,37 @@ public class FlightSummaryController extends Controller {
      * Used to load the page from the MenuController.
      */
     public void load() {
-        try {
-            theDataSet = getParent().getCurrentDataset();
-            ArrayList<FlightPath> flightPaths;
-            flightPaths = theDataSet.getFlightPaths();
-            for(int i = 0; i<flightPaths.size(); i++ ){
-                int pathID = flightPaths.get(i).getID();
-                String pathSource = flightPaths.get(i).departsFrom();
-                String pathDestin = flightPaths.get(i).arrivesAt();
-                String flightPathDisplayName = Integer.toString(pathID) + "_" + pathSource + "_" + pathDestin;
-                flightList.add(flightPathDisplayName);
-            }
-            flightPathListView.setItems(flightList);
-            flightSummaryListView();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (theDataSet.getFlightPaths().size() > 0){
-            map = new Map(mapView, theDataSet.getFlightPaths().get(0).getRoutePath());
-        }else{
-            map = new Map(mapView, new RoutePath());
-        }
-        flightPathListView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() {
-            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                int index = flightPathListView.getSelectionModel().getSelectedIndices().get(0);
-                if (index != -1) {
-                    map.displayRoute(theDataSet.getFlightPaths().get(index).getRoutePath());
+        if (theDataSet != null) {
+            try {
+                theDataSet = getParent().getCurrentDataset();
+                ArrayList<FlightPath> flightPaths;
+                flightPaths = theDataSet.getFlightPaths();
+                for (int i = 0; i < flightPaths.size(); i++) {
+                    int pathID = flightPaths.get(i).getID();
+                    String pathSource = flightPaths.get(i).departsFrom();
+                    String pathDestin = flightPaths.get(i).arrivesAt();
+                    String flightPathDisplayName = Integer.toString(pathID) + "_" + pathSource + "_" + pathDestin;
+                    flightList.add(flightPathDisplayName);
                 }
+                flightPathListView.setItems(flightList);
+                flightSummaryListView();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        });
+            if (theDataSet.getFlightPaths().size() > 0) {
+                map = new Map(mapView, theDataSet.getFlightPaths().get(0).getRoutePath());
+            } else {
+                map = new Map(mapView, new RoutePath());
+            }
+            flightPathListView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() {
+                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                    int index = flightPathListView.getSelectionModel().getSelectedIndices().get(0);
+                    if (index != -1) {
+                        map.displayRoute(theDataSet.getFlightPaths().get(index).getRoutePath());
+                    }
+                }
+            });
+        }
     }
     /**
      *  Removes the selected path from the list view of paths and from the database.