From 37e712f734936b8377614b06e4052069a1a15dda Mon Sep 17 00:00:00 2001
From: Sunguin Peng <spe76@uclive.ac.nz>
Date: Sat, 17 Sep 2016 20:33:20 +1200
Subject: [PATCH 1/3] Refactoring bugs fixed again

---
 res/userdb.db                                 | Bin 4368384 -> 4370432 bytes
 .../seng202/group9/Controller/Dataset.java    |  49 ++++++++++++++----
 .../java/seng202/group9/Core/Airport.java     |   3 +-
 .../group9/GUI/AirlineRDController.java       |   3 +-
 .../group9/GUI/AirportRDController.java       |  17 ++----
 .../seng202/group9/GUI/RouteRDController.java |  23 +++-----
 src/main/resources/airline_raw_data.fxml      |   2 +-
 src/main/resources/airport_raw_data.fxml      |   6 ---
 8 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index 13e6d06760233c8dd7029d8ffe6c077544053f46..e29a483fc9ba2bd33e80d341a861ccc9080dc0c2 100644
GIT binary patch
delta 1967
zcma)-e@s(X6vyv9x21g#O8b0Z8P9TC6<Y-qe~!^P+fF8bxQq<u1{$T>DpNDTGOGpy
zx+!WL1FJs#g+(2cK$ejuebGPGu$X23$2OC(1P!<?OXf0@nfQkZ%g$?EFlLk8*U$U*
z+|%B7&U?Av*EVt-+QyGVXMVOzBE&X`3=l$~%d-Mp(olV`RmL!b9U|-@JH&ougG^;N
zwcxn4l4_0P(n6}@`Btn_o-fJ3+^jhqX?908y}9fC=5VZD&Y4*w8`*q#GVOnNcjK<z
z&3q^}C>Ljx<}tRM#(c|izW7s~berBF#IWb!+z%dk+aGx;0tiD4h!M#^Oo&-~<Q2??
zzz!vX!eJ1uCmmR`mNd3^Y!S4ME#jVLW+4-rX;hqKhBELG)w!W)&pg`se-0J9`&}Km
z7%;T*EBp%fALp0(Wz=ro%X?8fd7Q^lkMc|W5^5Xo;XSB(`9*#awUJ-o7f>7cd43+X
zo}c6AP~YKa`B~H|-p#vFE4j*5R3AUX&!Cp^)BH4QDL=(ep_X`fjK}bclb_@#QS*2g
z?=mp}evMyC=>Q){=@1{%e0RlR+Dac2Gd)0Pk{)26u{t&bZo*!00f31<rt|cJEPv*3
zBpo8L*cCZf5QI=97zzd>A^j6g4?^fC)8r37$+!O30^w;EsF)^SI8EM|&g1p}y#w+K
zu|Db0k1bk~b3`IraNr;Oem~ybHAD~f7=!YsgOaBM=kp3#rG`hv7B?>7CYA!ntmI;m
zIPCV+s!h>w7-@<&>7t+8UH3#J6Ujm>n(JQnPyL3a<PuTE6V`3ot`pW}KqKu}JFME(
z4qIXv$fw$dD(MzvWs1xWsil-UZE>|UveOB#k}Ntw*eFY|BWw%vv26Gml5h+*LMEL6
z)zxh%n%cJ8)QMqfvx2oMl45q*tcg0K-7Z+B>eDuUCG|;cAzh%EZcCG<{37Zm^cKBA
z`{;T45j{W~={mZGmQlBA9+Uj)rZMRob^mSYbM1#aQVB2*9Z*f<(puARPz!5mJnbA^
zRi?}=rq`dk3tIn#v_7NKMeh(+%s3YP7yJs}!PjsD2A~Hzpbd7zW>^Q6P!4k;51W~!
zf6zPVNq5=z>`NABE$ltEiM`Ie^xO0`)JBi3GD|qv#O&78RVuW7W70<2?!7M|GY}cc
zL2{9qh#kp8UO@5@1(}67kOG7wPQ-=GM&=-MkwRo1;zm5kd}IMqgcKts$U<ZhQi?1_
zmLN-!Wyo@51@a<NhP;H7BVOcXWF_(nvP$#b_cip=liJl2{)b>SS5tGfz!;<E8vLkz
zAN%WRgKF{>mO}$oU3-m-ba%d6Z2PdY+Ds%_wwNt-brq{$d%I#aKJ`4DubG;!sa}oq
z?JZq?t)(k)R5Vo3(UfsU)z%Av+*o})L%+2JRQE=sVpr_C^C&n{TA&o9v{Wh8M&1$(
zR2%CFcqp@x{i-P*m|eA=EO90r0&(Og3Iw9yp0MOvgV9JR90^6yaiY56)Oy^BMFQat
z%off{lnO-OJQjx)lUo}iJ3`yH26skwY!5YT)%L{$k^!LYp9elJT{qbJ6ZzVazQBH(
zgB|LF>hCqy$Ih~2>{$Az=`En2McVqT5s1mz=!N<~BM_6Wrvv9y;7IamER#IfC@gwu
d>;VDx;Mt<mFV(eDc0v(|Y}HG#V)sq8e*@~yIC200

delta 1042
zcmY+@ZA=tL7zglq=DEAw+k;!i<$!V&Zz%`}lowA0&bIerZB2?mOeM4g4>{YC5>$?&
zH6+#8_C(1Q!iP!PMlm6@8r#&E+%#!YYGa!Ep~)pRsU~WG(l7e0CVVi#^g-#{WPZtJ
zv$Ol(o&TO#IKxk5&+y4&Z(y9Uyi06-OjT{;f$=Nx3#NtdF&D-eKEycQ#>@CIURRyV
z;wMn?WibTPuUgfiB<P*^854ZuU~;4~xj!;6eE5*%#OnW@7#`V}ru+Z*s=<Nj%T}$+
zC_>x{)8SzL)jzG(O6@Ji9HS@ePpyPfD<L49AaM{UaS@H^Y9-{>D>!4BKKDo5U4CUB
zV_eN^sdT?vrTdN15j0ssX}643bhPkhCIdY+!?G;LRj`)-OOTUy4X1p0sbo_9a?c2Y
zj}mI|h~d}x25#Wj`7v(8qo;2?9nO|kmd|?)W(&XN({;UTU?_3uXfn{)&=Ffd?%KVF
z=FXJ8WDpO@A-T$4^8S9&6=dfbdZa#KzO9Z-m`xnsP0glFHJi@MT;qX0)zcwv@SH*I
zHvYlB>K;8foKTH>MRw4pT)D8w@D^rh5Bf2TUcSud`8e<8G46rIwT$y17q5u}{-R8m
zQ}}iJpHv;O`t^LO_eU`&u!S90+D);lIkvO+nJm2{BEFyDJGca&!YLSn1F#QXfmYZo
zd+&%F^6Y)_jr#4bsN+}-=cKkEUUQy<`@CBPeh|CBlY@T#_X932iZ@-w9;{m{%{}}T
zzsDII!y(*{Z5YD3f9tawyq=Rs&~L6UeLWR=Ajk${k$mDK1*DJ^k!MIT@skqrEGZ=$
zNr2d-j66rmNd?(NDoGWoCYwnOsU>yfc~VarNF!+?TS$;>CELh$(o9-ND+!Su<OT8~
zc}ayHgx|RUsAeZ354ov52JNvM5$WHcDd#?k#33QIa7C-Mztv-s>bFpo|KVh(&V*%|
zy0x>ZEfS;dbnj{JN{vlL)Yw$?wBgtV*(a?%DnIx<>RbDGJD#-G@x{%?5|FjYsE}=2
zO4?=cd^C%KwM%U#S|;s0=O$lO#&ENmTwxU!ntS^OlYN0iPmi>(MhevNnP{Hl=~l>w
N!@OCYo{JuXzW|g@X4n7#

diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index cb21841..43b19e2 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -1,6 +1,7 @@
 package seng202.group9.Controller;
 
 
+import javafx.scene.chart.PieChart;
 import seng202.group9.Core.*;
 
 import java.sql.Connection;
@@ -786,6 +787,15 @@ public class Dataset {
      */
     public void addAirline(String name, String alias, String IATA, String ICAO, String callsign, String country, String active) throws DataException{
         Airline airlineToAdd = new Airline(name, alias, IATA, ICAO, callsign, country, active);
+        if (name.equals("")) {
+            throw new DataException("You cannot have a blank airline name.");
+        }
+        if (alias.length() <= 0) {
+            throw new DataException("Please insert '\\N' if the airline has no alias.");
+        }
+        if (country.equals("")) {
+            throw new DataException("You cannot have a blank country of origin field.");
+        }
         addAirline(airlineToAdd);
     }
 
@@ -827,6 +837,8 @@ public class Dataset {
             airlineToAdd.setID(airlineID);
             airlines.add(airlineToAdd);
             airlineDictionary.put(airlineToAdd.getName(), airlineToAdd);
+            stmt.close();
+            c.close();
         } catch ( Exception e ) {
             System.err.println( e.getClass().getName() + ": " + e.getMessage() );
             System.exit(0);
@@ -837,28 +849,39 @@ public class Dataset {
     public void addAirport(String name, String city, String country, String IATA_FFA, String ICAO, String latitude, String longitude,
                            String altitude, String timezone, String DST, String olsonTz) throws DataException{
         try{
+            //System.out.print(name + city + country + IATA_FFA + ICAO + latitude + longitude + altitude + timezone + DST + olsonTz);
             double latitudeVal = Double.parseDouble(latitude);
             double longitudeVal = Double.parseDouble(longitude);
             double altitudeVal = Double.parseDouble(altitude);
             double timezoneVal = Double.parseDouble(timezone);
+            if (city.equals("")) {
+                throw new DataException("You cannot have a blank city name.");
+            }
+            if (country.equals("")) {
+                throw new DataException("You cannot have a blank country name.");
+            }
             Airport airportToAdd = new Airport(name, city, country, IATA_FFA, ICAO, latitudeVal, longitudeVal, altitudeVal);
             City cityToAdd = new City(city, country, timezoneVal, olsonTz);
             Country countryToAdd = new Country(DST, country);
             addAirport(airportToAdd);
             addCity(cityToAdd);
             addCountry(countryToAdd);
+            createDataLinks();
         }catch (NumberFormatException e){
             throw new DataException("Latitude, Longitude, Altitude and Timezone must be numbers");
         }
     }
 
     public void addAirport(Airport airportToAdd) throws DataException{
-        if (airportToAdd.getIATA_FFA() != "" && airportToAdd.getIATA_FFA().length() != 3){
+        if (airportToAdd.getIATA_FFA().length() != 0 && airportToAdd.getIATA_FFA().length() != 3){
             throw new DataException("IATA/FFA either empty or 3 letters");
         }
-        if (airportToAdd.getICAO() != "" && airportToAdd.getICAO().length() != 4){
+        if (airportToAdd.getICAO().length() != 0 && airportToAdd.getICAO().length() != 4){
             throw new DataException("ICAO either empty or 4 letters");
         }
+        if (airportToAdd.getName().equals("")) {
+            throw new DataException("You cannot have an airport without a name.");
+        }
         for (String key : airportDictionary.keySet()){
             airportDictionary.get(key).hasDuplicate(airportToAdd);
         }
@@ -876,6 +899,7 @@ public class Dataset {
                     "\""+airportToAdd.getCountryName()+"\", \""+airportToAdd.getIATA_FFA()+"\", \""+airportToAdd.getICAO()+"\", " +
                     ""+airportToAdd.getLatitude()+", "+airportToAdd.getLongitude()+", "+airportToAdd.getAltitude()+");";
             stmt.execute(insertAirportQuery);
+            stmt.close();
             //get the airport id
             stmt = c.createStatement();
             String airportIDQuery = "SELECT * FROM `sqlite_sequence` WHERE `name` = \""+this.name+"_Airport\" LIMIT 1;";
@@ -887,11 +911,13 @@ public class Dataset {
             airportToAdd.setID(airportID);
             airports.add(airportToAdd);
             airportDictionary.put(airportToAdd.getName(), airportToAdd);
+            stmt.close();
+            airportIDRes.close();
+            c.close();
         } catch ( Exception e ) {
             System.err.println( e.getClass().getName() + ": " + e.getMessage() );
             System.exit(0);
         }
-        createDataLinks();
     }
 
     public void addCity(City city){
@@ -912,6 +938,7 @@ public class Dataset {
                 stmt.close();
                 cityDictionary.put(city.getName(), city);
                 cities.add(city);
+                c.close();
             } catch ( Exception e ) {
                 System.err.println( e.getClass().getName() + ": " + e.getMessage() );
                 System.exit(0);
@@ -936,6 +963,7 @@ public class Dataset {
                 stmt.close();
                 countryDictionary.put(country.getName(), country);
                 countries.add(country);
+                c.close();
             } catch ( Exception e ) {
                 System.err.println( e.getClass().getName() + ": " + e.getMessage() );
                 System.exit(0);
@@ -1013,6 +1041,8 @@ public class Dataset {
             //routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
             String routeKey = routeToAdd.getAirline() + routeToAdd.getDepartureAirport() + routeToAdd.getArrivalAirport() + routeToAdd.getCode() + routeToAdd.getStops() + routeToAdd.getEquipment();
             routeDictionary.put(routeKey, routeToAdd);
+            stmt.close();
+            c.close();
         } catch ( Exception e ) {
             System.err.println( e.getClass().getName() + ": " + e.getMessage() );
             System.exit(0);
@@ -1195,19 +1225,19 @@ public class Dataset {
             //check if number of countries that contain airlines > 0 else delete the country
             String countCountry = "SELECT COUNT(*) FROM `"+this.name+"_Airline` JOIN `"+this.name+"_Country` ON" +
                     " `"+this.name+"_Country`.`Country_Name` = `"+this.name+"_Airline`.`Country`" +
-                    " WHERE `"+this.name+"_Airline`.`Country` = \""+airline.getCountry().getName().replace("\"", "\"\"")+"\"";
+                    " WHERE `"+this.name+"_Airline`.`Country` = \""+airline.getCountryName().replace("\"", "\"\"")+"\"";
             ResultSet countCountryRes = stmt.executeQuery(countCountry);
             int countryCount = 0;
-            while (countCountryRes.next()){
-                countryCount +=  countCountryRes.getInt("COUNT(*)");
+            while (countCountryRes.next()) {
+                countryCount += countCountryRes.getInt("COUNT(*)");
             }
             countCountryRes.close();
             stmt.close();
-
+            stmt = c.createStatement();
             //check if number of counties that contain airports > 0 else delete the country
             String countCountryA = "SELECT COUNT(*) FROM `"+this.name+"_Airport` JOIN `"+this.name+"_Country` ON" +
                     " `"+this.name+"_Country`.`Country_Name` = `"+this.name+"_Airport`.`Country`" +
-                    " WHERE `"+this.name+"_Airport`.`Country` = \""+airline.getCountry().getName().replace("\"", "\"\"")+"\"";
+                    " WHERE `"+this.name+"_Airport`.`Country` = \""+airline.getCountryName().replace("\"", "\"\"")+"\"";
             countCountryRes = stmt.executeQuery(countCountryA);
             while (countCountryRes.next()){
                 countryCount +=  countCountryRes.getInt("COUNT(*)");
@@ -1217,12 +1247,13 @@ public class Dataset {
             //delete country if there are no matches
             if (countryCount == 0){
                 stmt = c.createStatement();
-                String deleteCountry = "DELETE FROM `"+this.name+"_Country` WHERE `Country_Name` = \""+airline.getCountry().getName()+"\"";
+                String deleteCountry = "DELETE FROM `"+this.name+"_Country` WHERE `Country_Name` = \""+airline.getCountryName()+"\"";
                 stmt.execute(deleteCountry);
                 stmt.close();
             }
             c.close();
         } catch ( Exception e ) {
+            e.printStackTrace();
             System.err.println( e.getClass().getName() + ": " + e.getMessage() );
             //System.exit(0);
         }
diff --git a/src/main/java/seng202/group9/Core/Airport.java b/src/main/java/seng202/group9/Core/Airport.java
index e4ee64e..b926049 100644
--- a/src/main/java/seng202/group9/Core/Airport.java
+++ b/src/main/java/seng202/group9/Core/Airport.java
@@ -365,7 +365,8 @@ public class Airport {
 		return distance;
 	}
 	public void hasDuplicate(Airport airport) throws DataException{
-		if (!airport.getName().equals("") && airport.getName().equals(this.name)){
+		if (airport.getName().equals("") || airport.getName().equals(this.name)){
+			//System.out.println(airport.getName() + " "+ this.name);
 			throw new DataException("Airport Name already Exists, Please Choose Another.");
 		}
 		if (!airport.getIATA_FFA().equals("") && airport.getIATA_FFA().equals(this.name)){
diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java
index c3e1d1d..8a447de 100644
--- a/src/main/java/seng202/group9/GUI/AirlineRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java
@@ -64,8 +64,6 @@ public class AirlineRDController extends Controller {
 
     private Dataset theDataSet = null;
 
-    //Dummy function to test the add button.
-    //Will edit when ID is added automatically.
     public void addAirlineSingle() {
         try {
             theDataSet.addAirline(
@@ -83,6 +81,7 @@ public class AirlineRDController extends Controller {
             airlCallsignBox.clear();
             airlCountryBox.clear();
             airlActiveCBox.getSelectionModel().clearSelection();
+            airlActiveCBox.setValue("Y");
             tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
         } catch ( Exception e ) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java
index b96fc36..9ac178e 100644
--- a/src/main/java/seng202/group9/GUI/AirportRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirportRDController.java
@@ -1,25 +1,15 @@
 package seng202.group9.GUI;
 
-import com.sun.javafx.collections.ObservableListWrapper;
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.value.ObservableStringValue;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.util.Callback;
 import seng202.group9.Controller.AirportFilter;
-import seng202.group9.Controller.App;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
 import seng202.group9.Core.Airport;
-import seng202.group9.Core.City;
-import seng202.group9.Core.Country;
 
+import static javafx.collections.FXCollections.observableArrayList;
 
 /**
  * Created by Sunguin on 2016/09/13.
@@ -116,7 +106,7 @@ public class AirportRDController extends Controller{
         airpTzcol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Tz"));
 
         theDataSet = getParent().getCurrentDataset();
-        tableViewAirportRD.setItems(FXCollections.observableArrayList(theDataSet.getAirports()));
+        tableViewAirportRD.setItems(observableArrayList(theDataSet.getAirports()));
 
         airpDSTCBox.setValue("E");
         airpDSTCBox.getItems().addAll("E", "A", "S", "O", "Z", "N", "U");
@@ -145,6 +135,7 @@ public class AirportRDController extends Controller{
                 airpAltitudeBox.clear();
                 airpTimezoneBox.clear();
                 airpDSTCBox.getSelectionModel().clearSelection();
+                airpDSTCBox.setValue("E");
                 airpTzBox.clear();
             tableViewAirportRD.setItems(FXCollections.observableArrayList(theDataSet.getAirports()));
         } catch ( Exception e ) {
@@ -162,7 +153,7 @@ public class AirportRDController extends Controller{
     public void deleteAirport(){
         Airport toDelete = tableViewAirportRD.getSelectionModel().getSelectedItem();
         theDataSet.deleteAirport(toDelete);
-        tableViewAirportRD.setItems(FXCollections.observableArrayList(theDataSet.getAirports()));
+        tableViewAirportRD.setItems(observableArrayList(theDataSet.getAirports()));
     }
 
     public void filterAirports() {
diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java
index b62978a..4f5194a 100644
--- a/src/main/java/seng202/group9/GUI/RouteRDController.java
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -4,16 +4,14 @@ import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
-import seng202.group9.Controller.App;
 import seng202.group9.Controller.DataException;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
 import seng202.group9.Controller.RouteFilter;
 import seng202.group9.Core.Route;
 
-import java.util.ArrayList;
-
 /**
+ * Controller class for the Routes Raw Data scene.
  * Created by Sunguin on 2016/09/14.
  */
 public class RouteRDController extends Controller {
@@ -64,9 +62,13 @@ public class RouteRDController extends Controller {
     private TextField rStopsFilter;
     @FXML
     private TextField rEquipmentFilter;
-    @FXML
+
     private Dataset theDataSet = null;
 
+    /**
+     * Adds a single route to the Route database.
+     * Takes in values written from the GUI.
+     */
     public void addRouteSingle() {
         try {
             theDataSet.addRoute(
@@ -81,19 +83,13 @@ public class RouteRDController extends Controller {
             rSourceBox.clear();
             rDestBox.clear();
             rCodeshareCBox.getSelectionModel().clearSelection();
+            rCodeshareCBox.setValue("");
             rStopsBox.clear();
             rEquipmentBox.clear();
             tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes()));
-        } catch (DataException e){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Route Data Error");
-            alert.setHeaderText("Error adding a custom route entry.");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
         } catch ( Exception e ) {
-            e.printStackTrace();
             Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Route Error");
+            alert.setTitle("Route Data Error");
             alert.setHeaderText("Error adding a custom route entry.");
             alert.setContentText(e.getMessage());
             alert.showAndWait();
@@ -128,7 +124,6 @@ public class RouteRDController extends Controller {
     public void filterRoutes(){
         RouteFilter filter = new RouteFilter(theDataSet.getRoutes());
         if (rAirlineFilter.getText() != null) {
-            //System.out.println("Hello over here");
             filter.filterAirline(rAirlineFilter.getText());
         }
         if (rSourceFilter.getText() != null) {
@@ -146,8 +141,6 @@ public class RouteRDController extends Controller {
         if (rEquipmentFilter.getText() != null) {
             filter.filterEquipment(rEquipmentFilter.getText());
         }
-//        System.out.println("Hello");
-//        filter.printFilter();
         tableViewRouteRD.setItems(FXCollections.<Route>observableArrayList(filter.getFilteredData()));
     }
 
diff --git a/src/main/resources/airline_raw_data.fxml b/src/main/resources/airline_raw_data.fxml
index a20c490..f1b276a 100644
--- a/src/main/resources/airline_raw_data.fxml
+++ b/src/main/resources/airline_raw_data.fxml
@@ -93,7 +93,7 @@
                            </padding>
                         </TextField>
                         <Label layoutX="14.0" layoutY="6.0" prefHeight="25.0" prefWidth="84.0" text="Add Airline:" />
-                        <ComboBox fx:id="airlActiveCBox" layoutX="1330.0" layoutY="-1.0" prefHeight="31.0" prefWidth="102.0" promptText="Active" />
+                        <ComboBox fx:id="airlActiveCBox" layoutX="1330.0" layoutY="3.0" prefHeight="31.0" prefWidth="102.0" promptText="Active" />
                      </children>
                   </Pane>
                </content>
diff --git a/src/main/resources/airport_raw_data.fxml b/src/main/resources/airport_raw_data.fxml
index bd6da16..da64a1e 100644
--- a/src/main/resources/airport_raw_data.fxml
+++ b/src/main/resources/airport_raw_data.fxml
@@ -93,15 +93,9 @@
                   </Pane>
                </content>
             </ScrollPane>
-<<<<<<< HEAD
-            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" onAction="#airportAnalyserButton" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
-            <Button layoutX="662.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
-            <Pane layoutX="15.0" layoutY="60.0" prefHeight="403.0" prefWidth="772.0">
-=======
             <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
             <Button layoutX="653.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
             <Pane layoutX="15.0" layoutY="60.0" prefHeight="342.0" prefWidth="764.0">
->>>>>>> raw_data_fixes
                <children>
                   <TableView fx:id="tableViewAirportRD" prefHeight="340.0" prefWidth="765.0">
                     <columns>

From 724f63956a55f7c7bb26489d38461d18722f6694 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Sun, 18 Sep 2016 01:21:30 +1200
Subject: [PATCH 2/3] Added Javadoc Strings for Some functions

---
 .../java/seng202/group9/Core/Airline.java     |  18 ++-
 .../java/seng202/group9/Core/Airport.java     |  44 ++++--
 src/main/java/seng202/group9/Core/City.java   |  76 +++++++++-
 .../java/seng202/group9/Core/Country.java     |  87 +++++++++++-
 .../java/seng202/group9/Core/FlightPath.java  |  81 ++++++++++-
 .../java/seng202/group9/Core/FlightPoint.java | 134 ++++++++++++++++--
 src/main/java/seng202/group9/Core/Route.java  |  25 +++-
 .../java/seng202/group9/Core/RoutePath.java   |  19 +++
 8 files changed, 442 insertions(+), 42 deletions(-)

diff --git a/src/main/java/seng202/group9/Core/Airline.java b/src/main/java/seng202/group9/Core/Airline.java
index 77574b5..926b07d 100644
--- a/src/main/java/seng202/group9/Core/Airline.java
+++ b/src/main/java/seng202/group9/Core/Airline.java
@@ -22,7 +22,7 @@ public class Airline{
 	private Country country = null;
 
 	/**
-	 * Constructor
+	 * Constructor for Airline when pulled from the database.
 	 * 
 	 * @param ID
 	 * @param name
@@ -45,7 +45,16 @@ public class Airline{
 		this.routes = new ArrayList<Route>();
 	}
 
-
+	/**
+	 * Constructor for Airline without ID this will be set later by the dataset from the dataset.
+	 * @param name
+	 * @param alias
+	 * @param IATA
+	 * @param ICAO
+	 * @param callSign
+	 * @param countryName
+	 * @param active
+	 */
 	public Airline(String name, String alias, String IATA, String ICAO, String callSign, String countryName, String active){
 		this.ID = -1;
 		this.IATA = IATA;
@@ -255,6 +264,9 @@ public class Airline{
 		if (this.name.equals(airline.getName())){
 			throw new DataException("This Airline Name already Exists, Please Choose Another.");
 		}
+		if (this.name.equals("")){
+			throw new DataException("This Airline Name cannot be Empty");
+		}
 		if (!this.IATA.equals("") && this.IATA.equals(airline.getIATA())){
 			throw new DataException("This IATA Code already Exists, Please Choose Another.");
 		}
@@ -273,7 +285,7 @@ public class Airline{
 	 */
 	@Override
 	public String toString(){
-		return name;
+		return name + ", IATA:" + IATA + ", ICAO: " + ICAO;
 	}
 	
 }
diff --git a/src/main/java/seng202/group9/Core/Airport.java b/src/main/java/seng202/group9/Core/Airport.java
index 447e0e5..2f19008 100644
--- a/src/main/java/seng202/group9/Core/Airport.java
+++ b/src/main/java/seng202/group9/Core/Airport.java
@@ -89,6 +89,11 @@ public class Airport {
 	public void setID(int iD) {
 		this.ID = iD;
 	}
+
+	/**
+	 * Sets the Name of the Airport.
+	 * @param name
+	 */
 	public void setName(String name){
 		this.name = name;
 	}
@@ -148,10 +153,18 @@ public class Airport {
 		}
 	}
 
+	/**
+	 * gets the country name
+	 * @return
+	 */
 	public String getCountryName() {
 		return countryName;
 	}
 
+	/**
+	 * sets the country name
+	 * @param countryName
+	 */
 	public void setCountryName(String countryName) {
 		this.countryName = countryName;
 	}
@@ -194,13 +207,6 @@ public class Airport {
 	public String getICAO(){
 		return ICAO;
 	}
-	/**
-	 * gets the IATA/FFA of the airport
-	 * @return IATA/FFA Code
-	 */
-//	public String IATA_FFA(){
-//		return IATA_FFA;
-//	}
 	/**
 	 * gets the altitude of the airport
 	 * @return Altitude of Airport
@@ -254,7 +260,10 @@ public class Airport {
 		return country;
 	}
 
-	//JavaDoc needed
+	/**
+	 * gets the timezone of the Airport
+	 * @return
+	 */
 	public Double getTimezone() {
 		if (this.city != null) {
 			return this.city.getTimezone();
@@ -262,7 +271,11 @@ public class Airport {
 			return 0.0;
 		}
 	}
-	//JavaDoc needed
+
+	/**
+	 * gets the DST of the Country the Airport is in.
+	 * @return
+	 */
 	public String getDST() {
 		if (this.country != null) {
 			return this.country.getDST();
@@ -270,7 +283,11 @@ public class Airport {
 			return "";
 		}
 	}
-	//JavaDoc needed
+
+	/**
+	 * gets the timezone in Olson format of the country the airport is in
+	 * @return
+	 */
 	public String getTz() {
 		if (this.city != null) {
 			return this.city.getTimeOlson();
@@ -364,6 +381,12 @@ public class Airport {
 		distance = 6371 * c;
 		return distance;
 	}
+
+	/**
+	 * Checks if the airport is a semi duplicate of this class. Used to see if it passes to enter into the Database.
+	 * @param airport
+	 * @throws DataException
+	 */
 	public void hasDuplicate(Airport airport) throws DataException{
 		if (airport.getName().equals("") || airport.getName().equals(this.name)){
 			throw new DataException("Airport Name already Exists, Please Choose Another.");
@@ -378,7 +401,6 @@ public class Airport {
 	/**
 	 * Information of the airport returned in String format.
 	 */
-
 	@Override
 	public String toString(){
 		return this.cityName +" Airport has ICAO: "+this.ICAO+", IATA/FFA: "+this.IATA_FFA+" and is located at ("+this.latitude+", "+this.longitude
diff --git a/src/main/java/seng202/group9/Core/City.java b/src/main/java/seng202/group9/Core/City.java
index 9661526..d541011 100644
--- a/src/main/java/seng202/group9/Core/City.java
+++ b/src/main/java/seng202/group9/Core/City.java
@@ -8,7 +8,14 @@ public class City {
 	private double timezone;
 	private String timeOlson;
 	private ArrayList<Airport> airports;
-	
+
+	/**
+	 * City Constructor
+	 * @param name
+	 * @param country
+	 * @param timezone
+	 * @param timeOlson
+	 */
 	public City(String name, String country, double timezone, String timeOlson){
 		this.name = name;
 		this.country = country;
@@ -16,23 +23,43 @@ public class City {
 		this.timeOlson = timeOlson;
 		this.airports = new ArrayList<Airport>();
 	}
-	
+
+	/**
+	 * Sets Name of the City
+	 * @param name
+	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * Sets Country that the city is in.
+	 * @param country
+	 */
 	public void setCountry(String country){
 		this.country = country;
 	}
 
+	/**
+	 * Set Timezone that the City is in.
+	 * @param timezone
+	 */
 	public void setTimezone(double timezone) {
 		this.timezone = timezone;
 	}
 
+	/**
+	 * Sets the time olson the city is in.
+	 * @param timeOlson
+	 */
 	public void setTimeOlson(String timeOlson) {
 		this.timeOlson = timeOlson;
 	}
 
+	/**
+	 * Sets the airports the are in the city
+	 * @param airports
+	 */
 	public void setAirports(ArrayList<Airport> airports) {
 		this.airports = new ArrayList<Airport>();
 		for (int i = 0; i < airports.size(); i ++) {
@@ -40,46 +67,81 @@ public class City {
 		}
 	}
 
+	/**
+	 * Gets the name of the city.
+	 * @return
+	 */
 	public String getName(){
 		return name;
 	}
 
+	/**
+	 * Gets the Country that the city is in.
+	 * @return
+	 */
 	public String getCountry(){
 		return country;
 	}
 
-
+	/**
+	 * gets the Timezone that the City is in.
+	 * @return
+	 */
 	public double getTimezone(){
 		return timezone;
 	}
-	
+
+	/**
+	 * Gets the Timezone in Olson format the City is in.
+	 * @return
+	 */
 	public String getTimeOlson(){
 		return timeOlson;
 	}
-	
+
+	/**
+	 * gets the Airports that are in this city.
+	 * @return
+	 */
 	public ArrayList<Airport> getAirports(){
 		return airports;
 	}
-	
+
+	/**
+	 * adds an airport that is in this city.
+	 * @param airport
+	 */
 	public void addAirport(Airport airport){
 		airports.add(airport);
 	}
 
+	/**
+	 * adds multiple airports to this city.
+	 * @param airports
+	 */
 	public void addAirport(ArrayList<Airport> airports){
 		for (int i = 0; i < airports.size(); i++){
 			addAirport(airports.get(i));
 		}
 	}
 
+	/**
+	 * Deletes an Airport from this City.
+	 * @param airport
+	 */
 	public void delAirport(Airport airport){
 		airports.remove(airport);
 	}
 
+	/**
+	 * Deletes an Airport by Index from this City.
+	 * @param index
+	 */
 	public void delAirport(int index) {
 		airports.remove(index);
 	}
 	@Override
 	public String toString(){
-		return this.name;
+		return this.name + " has " + airports.size() + " Airports and is in "+timeOlson;
 	}
 }
diff --git a/src/main/java/seng202/group9/Core/Country.java b/src/main/java/seng202/group9/Core/Country.java
index 6db3010..9d562ea 100644
--- a/src/main/java/seng202/group9/Core/Country.java
+++ b/src/main/java/seng202/group9/Core/Country.java
@@ -7,20 +7,37 @@ public class Country {
 	private ArrayList<City> cities = new ArrayList<City>();
 	private ArrayList<Airline> airlines = new ArrayList<Airline>();
 	private Position position;
-	
+
+	/**
+	 * Contructor for Country.
+	 * @param DST
+	 * @param name
+	 */
 	public Country(String DST, String name){
 		this.DST = DST;
 		this.name = name;
 	}
-	
+
+	/**
+	 * Sets the DST of the country.
+	 * @param dST
+	 */
 	public void setDST(String dST) {
 		DST = dST;
 	}
 
+	/**
+	 * Sets the name of the country.
+	 * @param name
+	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * Set Airlines that are based in this country.
+	 * @param airlines
+	 */
 	public void setAirlines(ArrayList<Airline> airlines) {
 		this.airlines = new ArrayList<Airline>();
 		for (int i = 0; i < airlines.size(); i ++) {
@@ -28,36 +45,68 @@ public class Country {
 		}
 	}
 
+	/**
+	 * Gets the DST of the Country.
+	 * @return
+	 */
 	public String getDST(){
 		return this.DST;
 	}
-	
+
+	/**
+	 * Gets the Name of the Country.
+	 * @return
+	 */
 	public String getName(){
 		return this.name;
 	}
-	
+
+	/**
+	 * gets the Airlines that belong in this Country.
+	 * @return
+	 */
 	public ArrayList<Airline> getAirlines(){
 		return airlines;
 	}
-	
+
+	/**
+	 * Adds an Airline that is based in this country.
+	 * @param airline
+	 */
 	public void addAirline(Airline airline){
 		this.airlines.add(airline);
 	}
 
+	/**
+	 * Adds multiple Airlines to this Country.
+	 * @param airlines
+	 */
 	public void addAirline(ArrayList<Airline> airlines){
 		for (int i = 0; i < airlines.size(); i++){
 			addAirline(airlines.get(i));
 		}
 	}
 
+	/**
+	 * deletes an Airline based in this country.
+	 * @param airline
+	 */
 	public void delAirline(Airline airline){
 		airlines.remove(airline);
 	}
 
+	/**
+	 * deletes an Airline in this country.
+	 * @param index
+	 */
 	public void delAirline(int index){
 		airlines.remove(index);
 	}
 
+	/**
+	 * sets the cities of this country
+	 * @param cities
+	 */
 	public void setCities(ArrayList<City> cities){
 		this.cities = new ArrayList<City>();
 		for (int i = 0; i < cities.size(); i++){
@@ -65,32 +114,60 @@ public class Country {
 		}
 	}
 
+	/**
+	 * adds a City to this country.
+	 * @param city
+	 */
 	public void addCities(City city){
 		this.cities.add(city);
 	}
 
+	/**
+	 * Add multiple Cities to this Country.
+	 * @param cities
+	 */
 	public void addCities(ArrayList<City> cities){
 		for (int i = 0; i < cities.size(); i++){
 			this.cities.add(cities.get(i));
 		}
 	}
 
+	/**
+	 * Deletes a city for this country.
+	 * @param city
+	 */
 	public void delCities(City city){
 		this.cities.remove(city);
 	}
 
+	/**
+	 * Deletes Cities in this Country
+	 * @param index
+	 */
 	public void delCities(int index){
 		this.cities.remove(index);
 	}
 
+	/**
+	 * Gets the CIties in this Country.
+	 * @return
+	 */
 	public ArrayList<City> getCities() {
 		return cities;
 	}
 
+	/**
+	 * gets the {@link Position}(double Latitude, double Longitude) of this Country.
+	 * @return
+	 */
 	public Position getPosition() {
 		return position;
 	}
 
+	/**
+	 * sets the {@link Position} of the Country.
+	 * @param position
+	 */
 	public void setPosition(Position position) {
 		this.position = position;
 	}
diff --git a/src/main/java/seng202/group9/Core/FlightPath.java b/src/main/java/seng202/group9/Core/FlightPath.java
index d72b4f6..b3c60ab 100644
--- a/src/main/java/seng202/group9/Core/FlightPath.java
+++ b/src/main/java/seng202/group9/Core/FlightPath.java
@@ -10,7 +10,7 @@ public class FlightPath {
 	final private RoutePath routePath = new RoutePath();
 
 	/**
-	 *
+	 * Constructor for this FLight Path from database
 	 * @param ID id of the the flight path in the database
 	 * @param departureAirport Iata/FFA of the airport
 	 * @param arrivalAirport IATA/FFA of the airport
@@ -22,17 +22,30 @@ public class FlightPath {
 		this.flightPoints = new ArrayList<FlightPoint>();
 	}
 
+	/**
+	 * COnstructor for FlightPath from dataset add later the ID needs to be set from database.
+	 * @param departureAirport
+	 * @param arrivalAirport
+	 */
 	public FlightPath(String departureAirport, String arrivalAirport){
 		this.ID = -1;
 		this.departureAirport = departureAirport;
 		this.arrivalAirport = arrivalAirport;
 		this.flightPoints = new ArrayList<FlightPoint>();
 	}
-	
+
+	/**
+	 * Gets the {@link FlightPoint} of this flight Path.
+	 * @return
+	 */
 	public ArrayList<FlightPoint> getFlightPoints() {
 		return flightPoints;
 	}
 
+	/**
+	 * Sets the {@link FlightPoint} of this Flight Path.
+	 * @param flightPoints
+	 */
 	public void setFlightPoints(ArrayList<FlightPoint> flightPoints) {
 		this.flightPoints = new ArrayList<FlightPoint>();
 		for (int i = 0; i < flightPoints.size(); i ++) {
@@ -40,56 +53,112 @@ public class FlightPath {
 		}
 	}
 
+	/**
+	 * Sets the {@link Airport} that the Flight Path leaves from.
+	 * @param departureAirport
+	 */
 	public void setDepartureAirport(String departureAirport) {
 		this.departureAirport = departureAirport;
 	}
 
+	/**
+	 * Sets the {@link Airport} that the Flight Path arrives at.
+	 * @param arrivalAirport
+	 */
 	public void setArrivalAirport(String arrivalAirport) {
 		this.arrivalAirport = arrivalAirport;
 	}
 
+	/**
+	 * Sets the ID that corresponds to the database for this flight path.
+	 * Also the ID that corresponds to {@see FlightPoint} IndexID
+	 * @param iD
+	 */
 	public void setID(int iD) {
 		ID = iD;
 	}
 
+	/**
+	 * gets the ID of the Flight Path.
+	 * @return
+	 */
 	public int getID(){
 		return ID;
 	}
-	
+
+	/**
+	 * gets the {@link Airport} that the FLight Departs from.
+	 * @return
+	 */
 	public String departsFrom(){
 		return departureAirport;
 	}
-	
+
+	/**
+	 * gets the {@link Airport} that the flight arrives at.
+	 * @return
+	 */
 	public String arrivesAt(){
 		return arrivalAirport;
 	}
-	
+
+	/**
+	 * Gets all the Points that the FLight passes
+	 * {@link FlightPoint}
+	 * @return
+	 */
 	public ArrayList<FlightPoint> getFlight(){
 		return flightPoints;
 	}
-	
+
+	/**
+	 * Adds a {@link FlightPoint} to the Flight Path.
+	 * @param flightPoint
+	 */
 	public void addFlightPoint(FlightPoint flightPoint){
 		flightPoints.add(flightPoint);
 	}
 
+	/**
+	 * Adds a {@link FlightPoint} to the Flight Path at a specific point of the flight.
+	 * @param flightPoint
+	 * @param index
+	 */
 	public void addFlightPoint(FlightPoint flightPoint, int index){
 		flightPoints.add(index, flightPoint);
 	}
 
+	/**
+	 * deletes a point from the flight.
+	 * @param flightPoint
+	 */
 	public void delFlightPoint(FlightPoint flightPoint){
 		flightPoints.remove(flightPoint);
 	}
 
+	/**
+	 * delets a point from the flight at a specific index.
+	 * @param index
+	 */
 	public void delFlightPoint(int index){
 		flightPoints.remove(index);
 	}
 
+	/**
+	 * Adds multiple {@link FlightPoint} to the FlightPath.
+	 * @param flightPoints
+	 */
 	public void addFlightPoint(ArrayList<FlightPoint> flightPoints){
 		for (int i = 0; i < flightPoints.size(); i ++){
 			this.flightPoints.add(flightPoints.get(i));
 		}
 	}
 
+	/**
+	 * Gets the {@link RoutePath} that the FlightPath traverses.
+	 * Also see {@see seng202.group9.Map.Map}
+	 * @return
+	 */
 	public RoutePath getRoutePath(){
 		if (routePath.getRoute().size() == 0){
 			for (FlightPoint point: flightPoints){
diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java
index 2e44249..ebe252b 100644
--- a/src/main/java/seng202/group9/Core/FlightPoint.java
+++ b/src/main/java/seng202/group9/Core/FlightPoint.java
@@ -15,6 +15,14 @@ public class FlightPoint {
 	private double latitude;
 	private double longitude;
 
+	/**
+	 * Constructor for FLight POint before set by the database.
+	 * @param type
+	 * @param name
+	 * @param altitude
+	 * @param latitude
+	 * @param longitude
+	 */
 	public FlightPoint(String type, String name, double altitude, double latitude, double longitude){
 		//extra calculations will have to be used to find heading, legdistance and total distance. If necessary
 		//Type 1 file the file the lecturers gave us
@@ -33,6 +41,20 @@ public class FlightPoint {
 		this.longitude = longitude;
 	}
 
+	/**
+	 * Constructor when getting points from the database.
+	 * @param name Name for the point.
+	 * @param ID Unique ID from Database.
+	 * @param indexID FOreighn key for {@link FlightPath}.
+	 * @param type
+	 * @param via
+	 * @param heading
+	 * @param altitude
+	 * @param legDistance
+	 * @param totalDistance
+	 * @param latitude
+	 * @param longitude
+	 */
 	public FlightPoint(String name, int ID, int indexID, String type, String via,
 			int heading, double altitude, double legDistance, double totalDistance,
 			double latitude, double longitude){
@@ -49,6 +71,11 @@ public class FlightPoint {
 		this.longitude = longitude;
 	}
 
+	/**
+	 * get the Path ID
+	 * @return
+	 * @throws DataException
+	 */
 	public int getIndexID() throws DataException {
 		if (this.ID == -1){
 			throw new DataException("ID not set.");
@@ -57,54 +84,107 @@ public class FlightPoint {
 		}
 	}
 
+	/**
+	 * sets the Path ID
+	 * @param indexID
+	 */
 	public void setIndexID(int indexID) {
 		this.indexID = indexID;
 	}
 
+	/**
+	 * sets the name of the path.
+	 * @param name
+	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * sets the Unique Database ID of the Path
+	 * @param iD
+	 */
 	public void setID(int iD) {
 		ID = iD;
 	}
 
+	/**
+	 * Sets the type of the Point.
+	 * @param type
+	 */
 	public void setType(String type) {
 		this.type = type;
 	}
 
+	/**
+	 * set the VIA of the Point.
+	 * @param via
+	 */
 	public void setVia(String via) {
 		this.via = via;
 	}
 
+	/**
+	 * Sets bearing the flight is heading.
+	 * @param heading
+	 */
 	public void setHeading(int heading) {
 		this.heading = heading;
 	}
 
+	/**
+	 * sets the altitude of the flight at this point.
+	 * @param altitude
+	 */
 	public void setAltitude(double altitude) {
 		this.altitude = altitude;
 	}
 
+	/**
+	 * sets the distance this flight takes before the next point.
+	 * @param legDistance
+	 */
 	public void setLegDistance(double legDistance) {
 		this.legDistance = legDistance;
 	}
 
+	/**
+	 * sets total distance travelled at this point.
+	 * @param totalDistance
+	 */
 	public void setTotalDistance(double totalDistance) {
 		this.totalDistance = totalDistance;
 	}
 
+	/**
+	 * sets the latitude at this point.
+	 * @param latitude
+	 */
 	public void setLatitude(double latitude) {
 		this.latitude = latitude;
 	}
 
+	/**
+	 * Sets the Longitude at this point.
+	 * @param longitude
+	 */
 	public void setLongitude(double longitude) {
 		this.longitude = longitude;
 	}
 
+	/**
+	 * gets the name of this point.
+	 * @return
+	 */
 	public String getName(){
 		return name;
 	}
 
+	/**
+	 * gets the UNIQUE ID at this point.
+	 * @return
+	 * @throws DataException
+	 */
 	public int getID() throws DataException {
 		if (this.ID == -1){
 			throw new DataException("ID not set.");
@@ -112,39 +192,75 @@ public class FlightPoint {
 			return ID;
 		}
 	}
-	
+
+	/**
+	 * gets the Path Index ID at this point.
+	 * @return
+	 */
 	public int getIndex(){
 		return indexID;
 	}
-	
+
+	/**
+	 * gets the type of this point.
+	 * @return
+	 */
 	public String getType(){
 		return type;
 	}
-	
+
+	/**
+	 * gets where the plane is via at this point.
+	 * @return
+	 */
 	public String getVia(){
 		return via;
 	}
-	
+
+	/**
+	 * gets the Heading bearing at this point
+	 * @return
+	 */
 	public int getHeading(){
 		return heading;
 	}
-	
+
+	/**
+	 * gets the altitude at this poitn.
+	 * @return
+	 */
 	public double getAltitude(){
 		return altitude;
 	}
-	
+
+	/**
+	 * gets the leg distance at this point.
+	 * @return
+	 */
 	public double getLegDistance(){
 		return legDistance;
 	}
-	
+
+	/**
+	 * gets total distance travelled by this flight so far.
+	 * @return
+	 */
 	public double getTotalDistance(){
 		return totalDistance;
 	}
-	
+
+	/**
+	 * gets longitude of this point.
+	 * @return
+	 */
 	public double getLongitude(){
 		return longitude;
 	}
-	
+
+	/**
+	 * gets the latitude of this point.
+	 * @return
+	 */
 	public double getLatitude(){
 		return latitude;
 	}
diff --git a/src/main/java/seng202/group9/Core/Route.java b/src/main/java/seng202/group9/Core/Route.java
index d95d02b..3a0c784 100644
--- a/src/main/java/seng202/group9/Core/Route.java
+++ b/src/main/java/seng202/group9/Core/Route.java
@@ -121,7 +121,12 @@ public class Route {
 			return ID;
 		}
 	}
-	//JavaDoc needed
+
+	/**
+	 * Gets this ID of the Airline.
+	 * @return
+	 * @throws DataException
+	 */
 	public int getAirlineID() throws DataException {
 		if (this.getAirline() != null) {
 			return this.getAirline().getID();
@@ -130,6 +135,11 @@ public class Route {
 		}
 	}
 
+	/**
+	 * Gets the ID of the Airport that the Route leaves from.
+	 * @return
+	 * @throws DataException
+	 */
 	public int getSourceID() throws DataException {
         if (this.getSourceAirport() != null) {
             return this.getSourceAirport().getID();
@@ -138,6 +148,11 @@ public class Route {
         }
 	}
 
+	/**
+	 * gets the destination ID of the Airport the Route is arriving at.
+	 * @return
+	 * @throws DataException
+	 */
 	public int getDestID() throws DataException {
         if (this.getDestinationAirport() != null) {
             return this.getDestinationAirport().getID();
@@ -248,6 +263,10 @@ public class Route {
 		}
 	}
 
+	/**
+	 * gets the RoutePath to be passed into {@link seng202.group9.Map.Map}.
+	 * @return
+	 */
 	public RoutePath getRoutePath(){
 		if (routePath == null) {
 			routePath = new RoutePath(
@@ -258,6 +277,10 @@ public class Route {
 		return routePath;
 	}
 
+	/**
+	 * What to print if printed as a string.
+	 * @return
+	 */
 	@Override
 	public String toString(){
 		
diff --git a/src/main/java/seng202/group9/Core/RoutePath.java b/src/main/java/seng202/group9/Core/RoutePath.java
index e8bf10b..bff8d7b 100644
--- a/src/main/java/seng202/group9/Core/RoutePath.java
+++ b/src/main/java/seng202/group9/Core/RoutePath.java
@@ -10,22 +10,41 @@ import java.util.Collections;
 public class RoutePath {
     private ArrayList<Position> route = new ArrayList<Position>();
 
+    /**
+     * Route Path constructor when the user knows the points.
+     * @param points
+     */
     public RoutePath(Position ...points) {
         Collections.addAll(route, points);
     }
 
+    /**
+     * Route Path constructor when the user doesn't know the points.
+     */
     public RoutePath(){
 
     }
 
+    /**
+     * adds a {@link Position} to the RoutePath.
+     * @param position
+     */
     public void addPosition(Position position){
         route.add(position);
     }
 
+    /**
+     * Gets the RoutePath positions.
+     * @return
+     */
     public ArrayList<Position> getRoute() {
         return route;
     }
 
+    /**
+     * Converts the RoutePath to an Array in JSON which can then be passed to the Map to display.
+     * @return
+     */
     public String toJSONArray() {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("[");

From b2cba96dc19985f21606fc655ce281dd23ebaa4a Mon Sep 17 00:00:00 2001
From: Sunguin Peng <spe76@uclive.ac.nz>
Date: Sun, 18 Sep 2016 10:38:54 +1200
Subject: [PATCH 3/3] Added javadoc for airline, airport and route raw data
 controller classes.

---
 res/userdb.db                                 | Bin 4370432 -> 4370432 bytes
 .../group9/GUI/AirlineRDController.java       |  56 +++++++++++-----
 .../group9/GUI/AirportRDController.java       |  23 +++++++
 .../seng202/group9/GUI/RouteRDController.java |  61 +++++++++++-------
 4 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index e29a483fc9ba2bd33e80d341a861ccc9080dc0c2..f83f4fdea289522eea82a9709b5dc166d60eaa33 100644
GIT binary patch
delta 250
zcmWN=xiUjh0D$2+xgz%E+U1g1V&8YM<<Ke=D%JlWiYWdugBe$q7f|U<O0VKk_-4N5
z?@OWiKQD*$BfAOd6B48#iF8O&I;A9C(k(sGD}B;012QN>GAyZ#$f%6TxJ<~TOv$vA
zC6gJMm5NklPUdAn7NsUjvMejIDr>SX8?q@|vMoEZD|@mp2XZJ!ax5ouDs?%NbGeX9
oxst{=@$)s@wu^7^J_&cNhxhoEWZ|(@YSik_F^}z-U;kA80PAyAV*mgE

delta 250
zcmWN=$u2`t0D$3~UR5*KOea&#^Q@*G5<5F9tAFV+YVk*c#I@=RSlLULUZs!1mwe66
zYp(e}D~9y5bQ{uVBuGvY>5{y3OF??1SNf!124ql%WLQQdl~Ea!ahZ@wnUZOlky$B9
zNy<`@s?5o}EXblPNllhzMOI}^)@4IBWlOeYM|NdT_T@kh<w%a@L{8;Q>T)g@aw%7G
nEsY=I*IT%6=ilQ)67E`$AMraWho@GdQLDeiEVg5I^IQD`=aW@M

diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java
index 8a447de..9363e79 100644
--- a/src/main/java/seng202/group9/GUI/AirlineRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java
@@ -9,6 +9,8 @@ import seng202.group9.Controller.Dataset;
 import seng202.group9.Core.Airline;
 
 /**
+ * The GUI controller class for airline_raw_data.fxml.
+ * Extends from the abstract class {@link Controller}.
  * Created by Sunguin on 2016/09/13.
  */
 public class AirlineRDController extends Controller {
@@ -64,6 +66,32 @@ public class AirlineRDController extends Controller {
 
     private Dataset theDataSet = null;
 
+    /**
+     * Loads the initial airline data to the GUI table.
+     * Also sets up the dropdown menu options.
+     */
+    public void load() {
+        airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
+        airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
+        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
+        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
+        airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
+        airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CountryName"));
+        airlActivecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
+
+        theDataSet = getParent().getCurrentDataset();
+        tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
+
+        airlActiveCBox.setValue("Y");
+        airlActiveCBox.getItems().addAll("Y", "N");
+    }
+
+    /**
+     * Adds a single airline entry to the database.
+     * Takes in values from the GUI the user has typed in.
+     * @see Dataset
+     */
     public void addAirlineSingle() {
         try {
             theDataSet.addAirline(
@@ -92,29 +120,23 @@ public class AirlineRDController extends Controller {
         }
     }
 
-    public void load() {
-        airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
-        airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
-        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
-        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
-        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
-        airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
-        airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CountryName"));
-        airlActivecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
-
-        theDataSet = getParent().getCurrentDataset();
-        tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
-
-        airlActiveCBox.setValue("Y");
-        airlActiveCBox.getItems().addAll("Y", "N");
-    }
-
+    /**
+     * Deletes a single selected airline entry from the database.
+     * Updates the GUI accordingly.
+     * @see Dataset
+     */
     public void deleteAirline() {
         Airline toDelete = tableViewAirlineRD.getSelectionModel().getSelectedItem();
         theDataSet.deleteAirline(toDelete);
         tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
     }
 
+    /**
+     * Filters airlines by any field.
+     * These are specified by what the user has typed in the filter boxes.
+     * Updates the GUI accordingly.
+     * @see AirlineFilter
+     */
     public void filterAirlines() {
         AirlineFilter filter = new AirlineFilter(theDataSet.getAirlines());
         if (airlNameFilter.getText() != null) {
diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java
index 9ac178e..7ed2ebe 100644
--- a/src/main/java/seng202/group9/GUI/AirportRDController.java
+++ b/src/main/java/seng202/group9/GUI/AirportRDController.java
@@ -12,6 +12,8 @@ import seng202.group9.Core.Airport;
 import static javafx.collections.FXCollections.observableArrayList;
 
 /**
+ * The GUI controller class for airport_raw_data.fxml.
+ * Extends from the abstract class {@link Controller}.
  * Created by Sunguin on 2016/09/13.
  */
 public class AirportRDController extends Controller{
@@ -91,6 +93,10 @@ public class AirportRDController extends Controller{
 
     private Dataset theDataSet = null;
 
+    /**
+     * Loads the initial airport data to the GUI table.
+     * Also sets up the dropdown menu options.
+     */
     public void load() {
         airpIDcol.setCellValueFactory(new PropertyValueFactory<Airport, String>("ID"));
         airpNamecol.setCellValueFactory(new PropertyValueFactory<Airport, String>("Name"));
@@ -112,6 +118,11 @@ public class AirportRDController extends Controller{
         airpDSTCBox.getItems().addAll("E", "A", "S", "O", "Z", "N", "U");
     }
 
+    /**
+     * Adds a single airport entry in the database.
+     * Takes in values from the GUI the user has typed in.
+     * @see Dataset
+     */
     public void addAirportSingle() {
         try {
             theDataSet.addAirport(
@@ -146,16 +157,28 @@ public class AirportRDController extends Controller{
             alert.showAndWait();
         }
     }
+
     public void airportAnalyserButton() {
         replaceSceneContent(SceneCode.AIRPORT_ANALYSER);
     }
 
+    /**
+     * Deletes a single selected airport entry from the database.
+     * Updates the GUI accordingly.
+     * @see Dataset
+     */
     public void deleteAirport(){
         Airport toDelete = tableViewAirportRD.getSelectionModel().getSelectedItem();
         theDataSet.deleteAirport(toDelete);
         tableViewAirportRD.setItems(observableArrayList(theDataSet.getAirports()));
     }
 
+    /**
+     * Filters the airports table by any field.
+     * These are specified by what the user has typed in the filter boxes.
+     * Updates the GUI accordingly.
+     * @see AirportFilter
+     */
     public void filterAirports() {
         AirportFilter filter = new AirportFilter(theDataSet.getAirports());
         if (airpNameFilter.getText() != null) {
diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java
index 4f5194a..6ae8d2c 100644
--- a/src/main/java/seng202/group9/GUI/RouteRDController.java
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -4,14 +4,14 @@ import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
-import seng202.group9.Controller.DataException;
 import seng202.group9.Controller.Dataset;
 import seng202.group9.Controller.SceneCode;
 import seng202.group9.Controller.RouteFilter;
 import seng202.group9.Core.Route;
 
 /**
- * Controller class for the Routes Raw Data scene.
+ * The GUI controller class for route_raw_data.fxml.
+ * Extends from the abstract class {@link Controller}.
  * Created by Sunguin on 2016/09/14.
  */
 public class RouteRDController extends Controller {
@@ -66,8 +66,31 @@ public class RouteRDController extends Controller {
     private Dataset theDataSet = null;
 
     /**
-     * Adds a single route to the Route database.
-     * Takes in values written from the GUI.
+     * Loads the initial route data to the GUI table.
+     * Also sets up the dropdown menu options.
+     */
+    public void load() {
+        rAirlineCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineName"));
+        rAirlineIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineID"));
+        rSourceCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
+        rSourceIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("SourceID"));
+        rDestCol.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
+        rDestIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DestID"));
+        rCodeshareCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Code"));
+        rStopsCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
+        rEquipmentCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
+
+        theDataSet = getParent().getCurrentDataset();
+        tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes()));
+
+        rCodeshareCBox.setValue("");
+        rCodeshareCBox.getItems().addAll("Y", "");
+    }
+
+    /**
+     * Adds a single route entry in the database.
+     * Takes in values from the GUI the user has typed in.
+     * @see Dataset
      */
     public void addRouteSingle() {
         try {
@@ -96,31 +119,23 @@ public class RouteRDController extends Controller {
         }
     }
 
-    public void load() {
-        rAirlineCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineName"));
-        rAirlineIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("AirlineID"));
-        rSourceCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
-        rSourceIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("SourceID"));
-        rDestCol.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
-        rDestIDCol.setCellValueFactory(new PropertyValueFactory<Route, String>("DestID"));
-        rCodeshareCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Code"));
-        rStopsCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
-        rEquipmentCol.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
-
-        theDataSet = getParent().getCurrentDataset();
-        tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes()));
-
-        rCodeshareCBox.setValue("");
-        rCodeshareCBox.getItems().addAll("Y", "");
-
-    }
-
+    /**
+     * Deletes a single selected route entry from the database.
+     * Updates the GUI accordingly.
+     * @see Dataset
+     */
     public void deleteRoute(){
         Route toDelete = tableViewRouteRD.getSelectionModel().getSelectedItem();
         theDataSet.deleteRoute(toDelete);
         tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes()));
     }
 
+    /**
+     * Filters the routes table by any field.
+     * These are specified by what the user has typed in the filter boxes.
+     * Updates the GUI accordingly.
+     * @see RouteFilter
+     */
     public void filterRoutes(){
         RouteFilter filter = new RouteFilter(theDataSet.getRoutes());
         if (rAirlineFilter.getText() != null) {