From fdce7e2f2fd6999e29970512ebbe94864905bc2f Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sat, 1 Oct 2016 18:25:56 +1300 Subject: [PATCH] Made Delete update the Flight Path Information --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/Controller/Dataset.java | 81 ++++++------------ 2 files changed, 25 insertions(+), 56 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index bd436605e3d1eade92cf6c575ebfb3aae3ccdaec..23bc7f6702b9c9e186376e96acf47995bbe3e527 100644 GIT binary patch delta 882 zcmXBONla5g90u?=ebpkgK-G%0AYhf}!@47aEZtDBtRm=u0;5P#L=Z(pkxes$^n}JZ z7YZSIBpyt(i6@UPCl4feFkZ1BJX3y8(s5!Q^X2p?K+Y+qwS2fm^TP+wJ#@G<@`xQk=j{T}~BqdnX1jS3@ zip;iZ#j@S170R(CyH$;oxbaXgdGx_4ztY7PE7I%f1}P;;7m4*Aj*&YD~bYOo`=6x2ObwJGnUWk!Eu8LSUH{n?%(pUvn+ zq*<=c=w31^JyArT>@lKEE*LQ&SB>bGo>|0%>@gxD7iRTRaz}nMrV*JphltAVIlTb? znm4BD*ylOj?K9hyPl`-j)?JhCWgYThCwO2N?1nwC7xuw^H~{%@5DMTB6haXkhGHmz zQYZs2_`nYV2tqj=fum3Xm2eC~PzBXc1GP{G^>7>--~=>66P$!oK%p60;53|pR%nBE zU~m@BK?j_NP6$I6T!4$v4VRz?E<-Q$!4>F-t8fhl;5rP#4H$x(a0`avHjKb%%)LDJ G(e)SLr%~Pj delta 879 zcmWm6Nla5g0LJmRREoBs6`#_LRjCi_jwmY7*Q%_7Am|h<4j>2>5Let-Jj~!tjfoQy zpdol7oJ_PHJb3f!N#J5IazMh#gW*7;-yDAL`_Id~H@5LlAA?sOt#tFXFO27N%Baey z#;DGyjnOTPrZ8$}G?meq7 zFz&sOH7o0@tY5NHyxm^mkD$uEco&m3B5NuV@Q6>S@x@30_9qu3W{~LV%1dFNG~d}{ zU&!wYvsb*IG)vSHu|8>*t8F4Ug{c>Pa>~TKoF=g@r$Gd#G3}yHPF&1So26=pSd*ui zC`@36MLb~^t36^yo(7XY6J~xWD_xmYlv#a2pU|VaTU*j5w5aA*m(&S0s=CMXmQ5&x z0}zCRa0m{=5jYCR;5Zb)2`Gk>a0*J`G@OC6Pzq&G4k5503=ud7=ivfWKqXW`HPk>Y zT!cEPhfB}^jc^&7pc$^fRUiO2ASG diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 71560f1..c677a15 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -1609,32 +1609,6 @@ public class Dataset { } stmt.close(); - int index = flightPath.getFlightPoints().indexOf(flightPoint); - - if (index == 0){ - try { - stmt = c.createStatement(); - String query = "UPDATE `"+this.name+"_Flight_Path` SET `Source_Airport` = \""+flightPoint.getName().replace("\"", "\"\"")+"\" " + - "WHERE `Path_ID` = "+flightPoint.getIndex(); - stmt.execute(query); - c.close(); - } catch ( Exception e ) { - System.err.println( e.getClass().getName() + ": " + e.getMessage() ); - } - flightPath.setDepartureAirport(flightPoint.getName()); - }else if (index == flightPath.getFlightPoints().size() - 1){ - try { - stmt = c.createStatement(); - String query = "UPDATE `"+this.name+"_Flight_Path` SET `Destination_Airport` = \""+flightPoint.getName().replace("\"", "\"\"")+"\" " + - "WHERE `Path_ID` = "+flightPoint.getIndex(); - stmt.execute(query); - c.close(); - } catch ( Exception e ) { - System.err.println( e.getClass().getName() + ": " + e.getMessage() ); - } - flightPath.setArrivalAirport(flightPoint.getName()); - } - c.close(); } catch ( Exception e ) { System.err.println( e.getClass().getName() + ": " + e.getMessage() ); @@ -1643,6 +1617,7 @@ public class Dataset { flightPath.getFlightPoints().remove(flightPoint); flightPointDictionary.remove(flightPoint); updateFlightPointInfo(flightPath); + updateFlightPath(flightPath); } /** @@ -2050,38 +2025,32 @@ public class Dataset { } catch ( Exception e ) { System.err.println( e.getClass().getName() + ": " + e.getMessage() ); } - FlightPath flightPath = flightPathDictionary.get(flightPoint.getIndex()); - int indexOf = flightPath.getFlightPoints().indexOf(flightPoint); + updateFlightPath(flightPathDictionary.get(flightPoint.getIndex())); + createDataLinks(); + } - if (indexOf == 0){ - try { - Class.forName("org.sqlite.JDBC"); - c = DriverManager.getConnection("jdbc:sqlite:res/userdb.db"); - stmt = c.createStatement(); - String query = "UPDATE `"+this.name+"_Flight_Path` SET `Source_Airport` = \""+flightPoint.getName().replace("\"", "\"\"")+"\" " + - "WHERE `Path_ID` = "+flightPoint.getIndex(); - stmt.execute(query); - c.close(); - } catch ( Exception e ) { - System.err.println( e.getClass().getName() + ": " + e.getMessage() ); - } - flightPath.setDepartureAirport(flightPoint.getName()); - } else if (indexOf == flightPath.getFlightPoints().size() - 1) { - try { - Class.forName("org.sqlite.JDBC"); - c = DriverManager.getConnection("jdbc:sqlite:res/userdb.db"); - stmt = c.createStatement(); - String query = "UPDATE `"+this.name+"_Flight_Path` SET `Destination_Airport` = \""+flightPoint.getName().replace("\"", "\"\"")+"\" " + - "WHERE `Path_ID` = "+flightPoint.getIndex(); - stmt.execute(query); - c.close(); - } catch ( Exception e ) { - System.err.println( e.getClass().getName() + ": " + e.getMessage() ); - } - flightPath.setArrivalAirport(flightPoint.getName()); + private void updateFlightPath(FlightPath flightPath){ + Connection c = null; + Statement stmt = null; + FlightPoint startPoint = flightPath.getFlightPoints().get(0); + FlightPoint endPoint = flightPath.getFlightPoints().get(flightPath.getFlightPoints().size() - 1); + try { + Class.forName("org.sqlite.JDBC"); + c = DriverManager.getConnection("jdbc:sqlite:res/userdb.db"); + stmt = c.createStatement(); + String querySource = "UPDATE `"+this.name+"_Flight_Path` SET `Source_Airport` = \""+startPoint.getName().replace("\"", "\"\"")+"\" " + + "WHERE `Path_ID` = "+startPoint.getIndex(); + stmt.execute(querySource); + stmt = c.createStatement(); + String queryDest = "UPDATE `"+this.name+"_Flight_Path` SET `Destination_Airport` = \""+endPoint.getName().replace("\"", "\"\"")+"\" " + + "WHERE `Path_ID` = "+endPoint.getIndex(); + stmt.execute(queryDest); + c.close(); + } catch ( Exception e ) { + System.err.println( e.getClass().getName() + ": " + e.getMessage() ); } - - createDataLinks(); + flightPath.setArrivalAirport(endPoint.getName()); + flightPath.setDepartureAirport(startPoint.getName()); } /**