X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FOrigin.java;h=efce11a79dc6b71678f2338afa05b8dac78e713a;hb=5bdd299653b9c3f29a817a555ae6a17eac41b75b;hp=aa63762a374c74d7592626a4c34c4db0a4e14d1e;hpb=1a2ddb852431259fab5dc522d8caf5b74bb3acd8;p=Persons_Comparator.git diff --git a/src/Origin.java b/src/Origin.java index aa63762..efce11a 100644 --- a/src/Origin.java +++ b/src/Origin.java @@ -4,15 +4,16 @@ import java.util.Arrays; public class Origin implements Comparable { private String continent = "Unknown"; private String country; - private String continents[] = {"Africa", "Americas", "Asia", "Europe", "Oceania"}; + private String[] continents = {"Africa", "Americas", "Asia", "Europe", "Oceania"}; private String[][] content2DArray = { {"Mali"}, /* Africa */ {"United States of America", "Brasil", "Mexico"}, /* Americas */ {"India"}, /* Asia */ - {"France", "Germany", "United Kingdom", "Belgium", "Norway"} /* Europe */, + {"France", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */ {"Australia"} /* Oceania */ }; + Origin() { } @@ -49,7 +50,7 @@ public class Origin implements Comparable { return stringArrayList.toArray(rtArray); } - private String getContinentFromCountry(String country) { + public String getContinentFromCountry(String country) { int continentKey = -1; for (int i = 0; i < content2DArray.length; i++) { if (Arrays.asList(content2DArray[i]).indexOf(country) != -1) {