X-Git-Url: https://git.piment-noir.org/?p=Persons_Comparator.git;a=blobdiff_plain;f=src%2FRegion.java;fp=src%2FRegion.java;h=2233e557ebf64b100e1279284f15ad64ffd465fd;hp=c97b5ff19fe12ca8159d8fc70091580b069f8864;hb=b340a28fcacc7c2d230897ec810b88718b954f42;hpb=dcde664f250e05357878e3802a997a81ba93c61a diff --git a/src/Region.java b/src/Region.java index c97b5ff..2233e55 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]), line.get(21)); + Country c = new Country(countryArray[0], 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]), line.get(21)); + Country c = new Country(countryArray[0], 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]), line.get(21)); + Country c = new Country(countryArray[0], 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]), line.get(21)); + Country c = new Country(countryArray[0], 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]), line.get(21)); + Country c = new Country(countryArray[0], line.get(12), Double.parseDouble(latLngArray[0]), Double.parseDouble(latLngArray[1]), line.get(21)); countryArrayListOceania.add(c); } }