X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FOrigin.java;h=efce11a79dc6b71678f2338afa05b8dac78e713a;hb=5bdd299653b9c3f29a817a555ae6a17eac41b75b;hp=30efb81c140862718dbe20c013629886a25f58a9;hpb=613054ac3144a04ab284e159b610317eacf67e1f;p=Persons_Comparator.git

diff --git a/src/Origin.java b/src/Origin.java
index 30efb81..efce11a 100644
--- a/src/Origin.java
+++ b/src/Origin.java
@@ -1,10 +1,25 @@
+import java.util.ArrayList;
+import java.util.Arrays;
+
 public class Origin implements Comparable<Origin> {
-    private String continent;
+    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", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */
+            {"Australia"} /* Oceania */
+    };
+
+
+    Origin() {
+    }
 
-    Origin(String continent, String country) {
+    Origin(String country) {
         setCountry(country);
-        setContinent(continent);
+        setContinent(this.getContinentFromCountry(country));
     }
 
     public String getContinent() {
@@ -23,6 +38,31 @@ public class Origin implements Comparable<Origin> {
         this.country = country;
     }
 
+    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";
+    }
+
     @Override
     public int compareTo(Origin origin) {
         return 0;