fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Liam Beckett
2016-09-18 13:45:35 +12:00
parent 0c98916c04 8a4134ae4c
commit 7ebfa6c182
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/Controller/Dataset.java
+13 -13
View File
@@ -16,19 +16,19 @@ public class Dataset {
String name; String name;
public static boolean getExisting = true;//constructor variables for action public static boolean getExisting = true;//constructor variables for action
static boolean createNew = false;//constructor variables for action public static boolean createNew = false;//constructor variables for action
ArrayList<Airline> airlines; private ArrayList<Airline> airlines;
ArrayList<Airport> airports; private ArrayList<Airport> airports;
ArrayList<Route> routes; private ArrayList<Route> routes;
ArrayList<FlightPath> flightPaths; private ArrayList<FlightPath> flightPaths;
ArrayList<Country> countries; private ArrayList<Country> countries;
ArrayList<City> cities; private ArrayList<City> cities;
LinkedHashMap<String, Airline> airlineDictionary; private LinkedHashMap<String, Airline> airlineDictionary;
LinkedHashMap<String, Airport> airportDictionary; private LinkedHashMap<String, Airport> airportDictionary;
LinkedHashMap<String, Route> routeDictionary; private LinkedHashMap<String, Route> routeDictionary;
LinkedHashMap<Integer, FlightPath> flightPathDictionary; private LinkedHashMap<Integer, FlightPath> flightPathDictionary;
LinkedHashMap<String, Country> countryDictionary; private LinkedHashMap<String, Country> countryDictionary;
LinkedHashMap<String, City> cityDictionary; private LinkedHashMap<String, City> cityDictionary;
/** /**
* *
src/main/java/seng202/group9/Core/Airline.java
+1 -1
View File
@@ -285,7 +285,7 @@ public class Airline{
*/ */
@Override @Override
public String toString(){ public String toString(){
return name + ", IATA:" + IATA + ", ICAO: " + ICAO; return name + ", IATA: " + IATA + ", ICAO: " + ICAO;
} }
} }
src/test/java/seng202/group9/AirlineTest.java
+4 -2
View File
@@ -123,7 +123,9 @@ public class AirlineTest extends TestCase {
//324,"All Nippon Airways","ANA All Nippon Airways","NH","ANA","ALL NIPPON","Japan","Y" //324,"All Nippon Airways","ANA All Nippon Airways","NH","ANA","ALL NIPPON","Japan","Y"
Airline allNipponAirways = new Airline(324, "All Nippon Airways", "ANA All Nippon Airways", Airline allNipponAirways = new Airline(324, "All Nippon Airways", "ANA All Nippon Airways",
"NH", "ANA", "ALL NIPPON", "Japan", "Y"); "NH", "ANA", "ALL NIPPON", "Japan", "Y");
assertTrue(allNipponAirways.toString() == "All Nippon Airways"); //name + ", IATA:" + IATA + ", ICAO: " + ICAO
assertEquals(allNipponAirways + "" ,"All Nippon Airways"); System.out.println(allNipponAirways.toString());
assertTrue(allNipponAirways.toString().equals("All Nippon Airways, IATA: NH, ICAO: ANA"));
assertEquals(allNipponAirways + "" ,"All Nippon Airways, IATA: NH, ICAO: ANA");
} }
} }