From 5d6d35276b5b0dc868d0b210ada63539ff0f0483 Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Sat, 24 Sep 2016 17:40:06 +1200
Subject: [PATCH] Fixed for merge

---
 src/main/java/seng202/group9/Controller/Dataset.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index f94ffdc..baa6f00 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -377,7 +377,7 @@ public class Dataset {
         ArrayList<Airline> airlinesToImport = parser.getResult();
         //check for dup
         int numOfDuplicates = 0;
-        int nextID = -1;
+        int nextID = 1;
         //query database.
         Connection c = null;
         Statement stmt = null;
@@ -450,7 +450,7 @@ public class Dataset {
         ArrayList<Country> countriesToImport = parser.getCountryResult();
         //check for dup
         int numOfDuplicates = 0;
-        int nextID = -1;
+        int nextID = 1;
         //query database.
         Connection c = null;
         Statement stmt = null;
@@ -582,7 +582,7 @@ public class Dataset {
         ArrayList<Route> routesToImport = parser.getResult();
         //check for dup
         int numOfDuplicates = 0;
-        int nextID = -1;
+        int nextID = 1;
         //query database.
         Connection c = null;
         Statement stmt = null;
@@ -724,7 +724,6 @@ public class Dataset {
                 numOfFlights++;
                 //}
             }
-            System.out.println(insertFlightPointQuery);
             if (numOfFlights > 0){
                 stmt.execute(insertFlightPointQuery);
             }