X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FOrigin.java;h=7ea4e536a487efde36ad6451076636698a25b43a;hb=d8b03ca81cef363ec5f57e0dbe46d0b47023314d;hp=dc3708c593bf99f6b1ce331914befc67d2b91d38;hpb=b4eb694d4fb81c92e694e72bec517559f2559faa;p=Persons_Comparator.git diff --git a/src/Origin.java b/src/Origin.java index dc3708c..7ea4e53 100644 --- a/src/Origin.java +++ b/src/Origin.java @@ -1,7 +1,7 @@ import java.util.ArrayList; import java.util.Arrays; -public class Origin implements Comparable { +public class Origin { private String continent = "Unknown"; private String country; private String[] continents = {"Africa", "Americas", "Asia", "Europe", "Oceania"}; @@ -9,10 +9,11 @@ public class Origin implements Comparable { {"Mali"}, /* Africa */ {"United States of America", "Brasil", "Mexico"}, /* Americas */ {"India"}, /* Asia */ - {"France", "Germany", "United Kingdom", "Belgium", "Norway"} /* Europe */, + {"France", "Italie", "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) { @@ -62,8 +63,9 @@ public class Origin implements Comparable { return "Unknown"; } - @Override - public int compareTo(Origin origin) { + public int distanceTo(Origin origin) { + + return 0; } }