gmgauthier
/
AirTravelLookup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

old changes I forgot to commit

This commit is contained in:
Greg Gauthier 2016-02-20 12:38:26 +00:00
parent bb2a1c6223
commit 92fbceadb0
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/AirportData.java
View File

@ -17,42 +17,53 @@ public class AirportData {
Airport airport = createAirport(row); Airport airport = createAirport(row);
airports.add(airport); airports.add(airport);
} }
// Collections.sort(airports);
} }
//Accessors //Accessors
public ArrayList<Airport> getAirports() { public ArrayList<Airport> getAllAirports() {
return airports; return airports;
} }
// Public methods // Public methods
public Airport findAirportByName(String name){ public Airport findAirportByName(String name){
for (Airport airport : this.airports){
if (airport.getName().contains(name)){
return airport;
}
}
return null; return null;
} }
public Airport findAirportByIATA(String iata){ public Airport findAirportByIATA(String iata){
//TODO: Searching by IATA identifier for (Airport airport : this.airports){
if (iata.equals(airport.getName())){
return airport;
}
}
return null; return null;
} }
public Airport findAirportByICAO(String icao){ public Airport findAirportByICAO(String icao){
//TODO: Searching by ICAO identifier for (Airport airport : this.airports){
if (icao.equals(airport.getName())){
return airport;
}
}
return null; return null;
} }
public ArrayList<Airport> findAirportsByCity(String city) { public ArrayList<Airport> findAirportsByCity(String city) {
ArrayList<Airport> searchResults = airports.stream().filter(airport -> city.equals(airport.getCity())). return airports.stream().filter(airport -> city.equals(airport.getCity())).
collect(Collectors.toCollection(ArrayList::new)); collect(Collectors.toCollection(ArrayList::new));
return searchResults;
} }
public Airport findAirportsByCountry(String country){ public ArrayList<Airport> findAirportsByCountry(String country){
//TODO: Searching by country name return airports.stream().filter(airport -> country.equals(airport.getCountry())).
return null; collect(Collectors.toCollection(ArrayList::new));
} }
public void sortAirports(){ public void sortAirportsByCity(){
Collections.sort(this.airports); Collections.sort(this.airports);
} }

6
src/DataReader.java
View File

@ -7,7 +7,7 @@ import java.util.List;
public class DataReader { public class DataReader {
static List<String[]> readCSVFile(String fname){ static List<String[]> readCSVFile(final String fname) {
CSVReader reader = null; CSVReader reader = null;
List<String[]> entries = null; List<String[]> entries = null;
try { try {
@ -16,7 +16,9 @@ public class DataReader {
e.printStackTrace(); e.printStackTrace();
} }
try { try {
if (reader != null) entries = reader.readAll(); if (reader != null) {
entries = reader.readAll();
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }

20
src/SearchTests.java
View File

@ -7,15 +7,25 @@ public class SearchTests {
AirportData airportData = new AirportData(); AirportData airportData = new AirportData();
ArrayList<Airport> chicagoAirports = airportData.findAirportsByCity("Chicago"); ArrayList<Airport> chicagoAirports = airportData.findAirportsByCity("Chicago");
for (Airport airport: chicagoAirports){ _printList(chicagoAirports);
System.out.printf("%-4s %-27s %-4.7f / %-4.7f \n", airport.getIata(), ArrayList<Airport> germanAirports = airportData.findAirportsByCountry("Germany");
airport.getName(), airport.getLat(), airport.getLon()); _printList(germanAirports);
} System.out.println(airportData.findAirportByName("O\'hare International"));
System.out.println(chicagoAirports);
} }
private static void _printList(ArrayList<Airport> airportList){
for (Airport airport: airportList){
System.out.printf("%-4s %-25s %-35s %-4.7f / %-4.7f %8d\n", airport.getIata(),
airport.getCity(), airport.getName(), airport.getLat(), airport.getLon(), airport.getAlt());
}
System.out.println(airportList);
}
} }