From 805eee58af25f4208c51ce7dc19f9a90647487b5 Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Sat, 1 Oct 2016 14:52:59 +1300
Subject: [PATCH] Updated the path so that it will update when the 2nd point
 becomes the 1st point

---
 res/userdb.db                                 | Bin 8387584 -> 8387584 bytes
 .../seng202/group9/Controller/Dataset.java    |   2 --
 .../group9/GUI/FlightRDController.java        |  20 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index f98b130e87d47fc7328ea7bf95b2284ac9015bfd..e70283afa54547c7448d691322529974ffda20b1 100644
GIT binary patch
delta 1197
zcmY+;Yfw~W9LMpq7dgA&!qUcdG4m4Zw#3zScSGdtE(@zmfN}{@>oHu^EJQ>$ys%(A
zAiikU)Sj4uMw>uNrm>RUQHi#jgwxGlSWTltFwN#zI*c``V^hC}>P2VH=gfT1bDr~m
zI_~_X=zu_~Jip{fngh>HLWztLIVB28l$6Y)B#IJ|5)~zCN}?%=p=3TK8cJd*iK9eI
zNjxPFP@<#c!BLVhRHB>}6tkgt$rw?@Xk<zuDWTd^YWMWq_as0fBtbHyKq}}V4Hm#d
zun-=GMX(r_z*2Z5bl;O6^;_(O5GT|NxNpjq3H?kf86>|&rcoydIzgurajEi^8ukBQ
zsmtn|ZhJ-5a*IXUHI*aDCp}@;_!`@#{aVR;ME6VZi>UwJ8?iYF|B6%KXDZd)@rzg2
zW(!?khl_$W%H*Saq%BuIO1V)V5Cp-%$BJ<({;iso*$v5lt6Zaw=ZBH=!^oWOn(}qI
zIaXOfI{8yq-;&O@uq)ghJkX(%yaC^hd$v~#fA=<PqotsHrQ)B_I>p@18hcrh9iww?
zc^EF89BJ)}u`CF?%zwV0b>dseYl>QWH7iZ3H{Uwz+*YBmspjVDg@3nKuE*fKY<_U*
z!;Rm>ezz)x9kLrNVra2bfBZ}fyU1hm+@jW&#73rcAU?QxY(x9?pP9p9$P~|3jugJw
z+Q58#<&C7$!J^@NY?Q~iw6C$C?^kx4$2;k_yiE;vS&oy(mrd_p*8A8_r@<@^rH`Ag
zln=7gJYGIGB)?YO+Y@mbU|A^QG&b~$fiwQ%xAePN)s!($9L{hT^j;ohFHIROB2Bz{
zecEqlpYs_0)KsD^pU<LyMD!i(wAu$u%+2G_*7oL$uU%l>JWjZ}zt<hy&OYJMKkxkO
zQ?(OJK8+Zu%lJWac!EhhMo;_NES^->K5aCMZ})z7>iEZ(*m=HkYV7djE0cHG9Uc?G
zp0$6B)v^^c#!T_Ok!ow(wMMpM1}hi#-gZY1jIlR)jBegEJ7D;#Co*G%N5KRc@EBx5
z7Gy&X<U$@S2Q#by3s}Jhk3&AJgaTLvg&=_)9N>f^a6vJYfE!lB8t_0VJOO1;4i&H#
z)<GpyK{eFClTZump$;~{M%V;T!P7usGdu(Jum!x(09#=jY=>uI2RsMQLnG{jCfEhd
dup3%n543_0UVt{(3;SR{9Dw#vWX7M8{5Jp|8fyRm

delta 1183
zcmY+>c}x>o0LSr}wlY(pa?~PKJl11N0g=<OpfYVis}*#mpn&M}Km}Y8FFa5n`ii;<
z!Nu@4WXZ0u5?7a~QHuJ9X~bQ#t|saqCT?6)ty&W_##=W={S6+`Nj{T&-+PmJZ>H|m
zJ9Qm24OOLw?2WeJUQa0DDN#|PrbI)@07`-=5hxKU(NZ#yl3+?gDA7?eh>}oB!YB!+
zB!Ut>C4;+(p>w+C38#M26E2$r>R??6ui*@a+#<W9;f>P(kuU_Jzz9QO7(~Nx7y%<;
z6nq1tVGN9gaXoLG-v&J!#BrhAZl2HNc5}VFiiOE0xmG)b({p;YfJ>Y2oRy)`X(g3T
z8?KD1`bX`Kg4uIZC5dm6tNy*>8&*@~&Gx!IlfGKTf3d3d(!ThvDUtoFw$+JpX;XFI
z|CXOVJ*}Fo)_r~}OSPIJ1U65SR^<pR$7(Xxa>^dQ-j&rkZN~g$OA5F1vRvg$l2v~@
zy;+_DO;qy+dD*qI#=fQ4+lTRSyiRMt=0inM5JXY=g4Q{%L~r()nU)JRVRGqS{R7XX
zAdC3%jQuC)^9pgsl*B~5K$N`?$|EjJ*u{2PO_FdT+PJVU?k4+7i9bg_zdk&=jA?9$
zQ_bsQZgrM3o6VFU94&vjn&h8n)ymAT>8YWvxBFSQ5+^HT+Fo=uvZqQM?ha{+J1w##
zJK~St_Too*XIQ1(lqT%IBaK-Z-@y(m(U{qyY0p^E5U`sdrYB%GFaKHC^ZeBPod14g
zE}uC?=y0bOMjlUKjXtv^)Qi9T&=oa+T~y*X-gDqYV;dWI3$d@YW9@>)Wz3<(4v%hU
zWb-}dR-)DM&>ejB5Id(tOM7hPjh0PJbsN!nZ&7ab)Ei7z;#l2*3U5&o+kV@eCLBCe
zGWKq^o1Io>I^teGX08(UN{L?6h=x(!2iZiwIYBsbzO6VzbB$H_G2=<rXNk>5_PY|t
zvi|WMjpZ5welx^E9K^$TNPr2D2uY9(DUb?jFcBn}1Qtk#444d4U@ByS3|6p#9kL)B
zronV@zzmoPPM8HbkPEY64txi5ArD-T4+Ss}=0hPAK`|_V5?Ba}fWTr{0!v{Tl)`er
xPxY^aGAM@%SOwq1YN&)YPz7sY9ju29uo0?Z6KsYpuoY@x8*J|h_-l<(?*V$W5H0`!

diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index 5704540..2aff0d5 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -467,7 +467,6 @@ public class Dataset {
             while (IDResult.next()) {
                 nextID = Integer.parseInt(IDResult.getString("seq")) + 1;//for some reason sqlite3 stores incremental values as a string...
             }
-            System.out.println(nextID);
             stmt.close();
             stmt = c.createStatement();
             String insertAirportQuery = "INSERT INTO `" + this.name + "_Airport` (`Name`, `City`, `Country`, `IATA/FFA`," +
@@ -1610,7 +1609,6 @@ public class Dataset {
             stmt.close();
 
             int index = flightPath.getFlightPoints().indexOf(flightPoint);
-            System.out.println(index);
 
             if (index == 0){
                 try {
diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java
index 93085fd..4afd3f7 100644
--- a/src/main/java/seng202/group9/GUI/FlightRDController.java
+++ b/src/main/java/seng202/group9/GUI/FlightRDController.java
@@ -255,6 +255,7 @@ public class FlightRDController extends Controller {
             e.printStackTrace();
         }
         updateTable(currentPathIndex);
+        updatePaths();
 
     }
 
@@ -267,6 +268,7 @@ public class FlightRDController extends Controller {
             e.printStackTrace();
         }
         updateTable(currentPathIndex);
+        updatePaths();
     }
 
     /**
@@ -281,6 +283,24 @@ public class FlightRDController extends Controller {
         flightTableView.refresh();
     }
 
+    private void updatePaths(){
+        try {
+            flightPathListView.getItems().clear();
+            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);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Will link to the flight analyser when implemented.
      */