X-Git-Url: https://git.piment-noir.org/?p=Persons_Comparator.git;a=blobdiff_plain;f=src%2FRegion.java;fp=src%2FRegion.java;h=c97b5ff19fe12ca8159d8fc70091580b069f8864;hp=7c50c89a3184138ed043acb7cd13ccbc81de8328;hb=f710e396068ce8fb27e753a3e1be0b36430275b1;hpb=40a334105841fc2f6e175291e9e7bcfe56f3437c diff --git a/src/Region.java b/src/Region.java index 7c50c89..c97b5ff 100644 --- 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); } }