Country+Region add flag

diff --git a/src/Country.java b/src/Country.java
index cb672731751803f73034a76dd3e55280c5637c8d..2516c2bfdc4172b41d9f5da9b4fc5fdb207bee7e 100644 (file)
--- a/src/Country.java
+++ b/src/Country.java
@@ -1,17 +1,16 @@
-import javax.swing.*;
-
 public class Country {
     private String name;
     private String region;
     private double lat;
     private double lng;
-    private ImageIcon flag;
+    private String flag;
 
-    public Country(String name, String region, double lat, double lng) {
+    public Country(String name, String region, double lat, double lng, String flag) {
         setName(name);
         setRegion(region);
         setLat(lat);
         setLng(lng);
+        setFlag(flag);
     }
 
     public void setName(String name) {
@@ -42,6 +41,14 @@ public class Country {
         return lng;
     }
 
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
     public int distanceTo(Country country) {
         if ((this.lat == country.lat) && (this.lng == country.lng)) {
             return 0;
@@ -64,6 +71,7 @@ public class Country {
                 ", region='" + region + '\'' +
                 ", lat=" + lat +
                 ", lng=" + lng +
+                ", flag=" + flag +
                 '}';
     }
 }

diff --git a/src/Region.java b/src/Region.java
index 7c50c89a3184138ed043acb7cd13ccbc81de8328..c97b5ff19fe12ca8159d8fc70091580b069f8864 100644 (file)
--- a/src/Region.java
+++ b/src/Region.java
@@ -55,19 +55,19 @@ public class Region {
             String latLng = line.get(16);
             String[] latLngArray = latLng.split(",");
             if (line.get(12).equals("Europe")) {
-                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]));
+                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21));
                 countryArrayListEurope.add(c);
             } else if (line.get(12).equals("Africa")) {
-                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]));
+                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21));
                 countryArrayListAfrica.add(c);
             } else if (line.get(12).equals("Americas")) {
-                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]));
+                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21));
                 countryArrayListAmericas.add(c);
             } else if (line.get(12).equals("Asia")) {
-                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]));
+                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21));
                 countryArrayListAsia.add(c);
             } else if (line.get(12).equals("Oceania")) {
-                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]));
+                Country c = new Country(countryArray[1], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21));
                 countryArrayListOceania.add(c);
             }
         }