X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FOrigin.java;h=c02dd28a1f4b777de433777a5e5452b8a6702f31;hb=5687dc10a68b52d28b63151d8c16a45775ef2e77;hp=6e89fb93e36900638f8ea51dd4728d48d3e047e2;hpb=b974e749af3a4b2df3737b2d361233c704dcc4d8;p=Persons_Comparator.git

diff --git a/src/Origin.java b/src/Origin.java
index 6e89fb9..c02dd28 100644
--- a/src/Origin.java
+++ b/src/Origin.java
@@ -1,14 +1,24 @@
-public class Origin implements Comparable<Origin> {
-    private String continent;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class Origin {
+    private String continent = "Unknown";
     private String country;
+    private String[] continents = {"Africa", "Americas", "Asia", "Europe", "Oceania"};
+    private String[][] content2DArray = {
+            {"Mali"}, /* Africa */
+            {"United States of America", "Brasil", "Mexico"}, /* Americas */
+            {"India"}, /* Asia */
+            {"France", "Italie", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */
+            {"Australia"} /* Oceania */
+    };
 
     Origin() {
     }
 
     Origin(String country) {
         setCountry(country);
-        //TODO: properly set the continent from the country.
-        setContinent("Europe");
+        setContinent(this.getContinentFromCountry(country));
     }
 
     public String getContinent() {
@@ -27,8 +37,32 @@ public class Origin implements Comparable<Origin> {
         this.country = country;
     }
 
-    @Override
-    public int compareTo(Origin origin) {
+    public String[] getCountriesArray() {
+        ArrayList<String> stringArrayList = new ArrayList<>();
+        for (int i = 0; i < this.content2DArray.length; i++) {
+            for (int j = 0; j < this.content2DArray[i].length; j++) {
+                stringArrayList.add(this.content2DArray[i][j]);
+            }
+        }
+        stringArrayList.sort(String::compareToIgnoreCase);
+        String[] rtArray = new String[stringArrayList.size()];
+        return stringArrayList.toArray(rtArray);
+    }
+
+    public String getContinentFromCountry(String country) {
+        int continentKey = -1;
+        for (int i = 0; i < content2DArray.length; i++) {
+            if (Arrays.asList(content2DArray[i]).indexOf(country) != -1) {
+                continentKey = i;
+            }
+        }
+        if (continentKey != -1)
+            return this.continents[continentKey];
+        else
+            return "Unknown";
+    }
+
+    public int distanceTo(Origin origin) {
         return 0;
     }
 }