From 79b73f845edc12272c44a689f34c0d69a6d56572 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Fri, 30 Sep 2016 10:48:59 +1300 Subject: [PATCH] Reverted Merge Error where changes were deleted --- src/main/java/seng202/group9/Controller/Dataset.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 813472c..3743aeb 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -2053,15 +2053,16 @@ public class Dataset { } catch ( Exception e ) { System.err.println( e.getClass().getName() + ": " + e.getMessage() ); } - - FlightPath flightPath = flightPathDictionary.get(flightPoint.getIndexID()); + FlightPath flightPath = flightPathDictionary.get(flightPoint.getIndex()); int indexOf = flightPath.getFlightPoints().indexOf(flightPoint); 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.getIndexID(); + "WHERE `Path_ID` = "+flightPoint.getIndex(); stmt.execute(query); c.close(); } catch ( Exception e ) { @@ -2070,9 +2071,11 @@ public class Dataset { 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.getIndexID(); + "WHERE `Path_ID` = "+flightPoint.getIndex(); stmt.execute(query); c.close(); } catch ( Exception e ) {