From ca12ff4202b54f988833fa6716444ecd8f453ccc Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sat, 1 Oct 2016 18:53:20 +1300 Subject: [PATCH] Fixed flightPaths adding new flight path error --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/Controller/Dataset.java | 55 +++++------------- 2 files changed, 15 insertions(+), 40 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index ada920437f82cf5d6466b69c2dcb9310c362dd0f..30702da837c269108b74c764443030c19f1bcad4 100644 GIT binary patch delta 939 zcmZ|NNlX(_7{KxO<`rq{bg&FlMT#OWh-;BW!G&U>f+$!Xv|jL-ANkZ+ysjG-*yuni3im9LT^bWWos-+*l1A9vH~N z8hDWnyH`$n(zLqEH1#g+Eh~Pd{JQQCmetx`*Jjg=zfn!3Hk|s>XchU|Baw((2%*%x zP`}krHLqsWH~ac0rDrH9^`)m_r01Kh7Y>J04E3tG{J2u|TN zqG(44I?;tQIE!waLkvCW#d-9h9|O36K@4FS7jX$AxQr{ficws{b&Mg78@P#ExQ#ow zi+i|_2Y8q+h$gm(=Zv3M^`xDSRvPPTiinKu&VxpK9Yj)y7h_l^j^EHkW$4-1dx?Rs<@OF*|Px r)0yh)OuR1FN`;$*l{C#{|H>D*+)Z7f`T&Et@?(}8rR%#AZ(sfaI4cBr delta 808 zcmY+?OHWfl7{>9LGi^DoEm%)a6^mG}l`2}Kc)<&36^kgK)dE#4SSm$P(boH=ZCv0| z6C+#w2nLe6aN*7mU`%ui(YWf$g>h5=#}!WUOD50EJezq-ziX<57Xi8OvMDAP-i>t{ zjoW})Rs_Lh8{i|}=m6T3r zr8;1~u~|_{zW(O5xy6!LQo7K^qF9`p$#}QT29qZISdBGk#99Q!TgA)mP4Vq$xa}2HjfHY0XKbrfG)oFU$3R`P|S*@k0kgq;q8W%Gv*(x`q;o VM5HE+^2G97cUhH{c&hmR?O$MQ?Na~% diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 8217b2c..5346da6 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -1153,21 +1153,22 @@ public class Dataset { String insertPathQuery = "INSERT INTO `" + this.name + "_Flight_Path` (`Path_ID`, `Source_Airport`, " + "`Destination_Airport`) VALUES ("+pathID+", \""+sourceAirport+"\", \""+destAirport+"\" )"; stmt.execute(insertPathQuery); - } catch (Exception e){ - System.err.println( e.getClass().getName() + ": " + e.getMessage() ); - System.exit(0); - } - newPath.setID(pathID); - flightPathDictionary.put(pathID, newPath); - flightPaths.add(newPath); - FlightPoint sourcePoint = new FlightPoint(sourceAirport, pathID); - FlightPoint destinationPoint = new FlightPoint(destAirport, pathID); - try{ + newPath.setID(pathID); + + flightPathDictionary.put(pathID, newPath); + flightPaths.add(newPath); + FlightPoint sourcePoint = new FlightPoint(sourceAirport, pathID); + FlightPoint destinationPoint = new FlightPoint(destAirport, pathID); + addFlightPointToPath(sourcePoint); addFlightPointToPath(destinationPoint); + updateFlightPath(newPath); } catch (DataException e){ System.err.println( e.getClass().getName() + ": " + e.getMessage() ); System.exit(0); + }catch (Exception e){ + System.err.println( e.getClass().getName() + ": " + e.getMessage() ); + System.exit(0); } } @@ -2047,13 +2048,10 @@ public class Dataset { 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("\"", "\"\"")+"\" " + + String query= "UPDATE `"+this.name+"_Flight_Path` SET `Source_Airport` = \""+startPoint.getName().replace("\"", "\"\"")+"\", " + + "`Destination_Airport` = \""+endPoint.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); + stmt.execute(query); c.close(); } catch ( Exception e ) { System.err.println( e.getClass().getName() + ": " + e.getMessage() ); @@ -2089,30 +2087,7 @@ public class Dataset { stmt.execute(updatePointOrderQuery); } stmt.close(); - - if (index == 0 || curIndex == 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 || curIndex == 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()); - } + updateFlightPath(flightPath); c.close(); } catch ( Exception e ) { System.err.println( e.getClass().getName() + ": " + e.getMessage() );