old changes I forgot to commit

src/AirportData.java

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

src/DataReader.java

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

src/SearchTests.java

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