From: Sylvain Papa <sylvain.papa@yahoo.fr>
Date: Wed, 16 Jan 2019 12:54:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=3fc1aed88123babd636df3a0de26a4a87e472497;hp=-c;p=Persons_Comparator.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Main.java
---

3fc1aed88123babd636df3a0de26a4a87e472497
diff --combined src/Origin.java
index efce11a,c02dd28..41b5b36
--- a/src/Origin.java
+++ b/src/Origin.java
@@@ -1,7 -1,7 +1,7 @@@
  import java.util.ArrayList;
  import java.util.Arrays;
  
- public class Origin implements Comparable<Origin> {
+ public class Origin {
      private String continent = "Unknown";
      private String country;
      private String[] continents = {"Africa", "Americas", "Asia", "Europe", "Oceania"};
@@@ -9,11 -9,10 +9,11 @@@
              {"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() {
      }
  
@@@ -63,8 -62,7 +63,7 @@@
              return "Unknown";
      }
  
-     @Override
-     public int compareTo(Origin origin) {
+     public int distanceTo(Origin origin) {
          return 0;
      }
  }