Add an ArrayList of persons to the Person class.

[Persons_Comparator.git] / src / Person.java

diff --git a/src/Person.java b/src/Person.java
index 9c30e56c9e4e5d3055f7e1bea97466520a86597a..c0483f8eb85b25cc6f25508ba021a5e266a1d203 100644 (file)
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,3 +1,4 @@
+import java.util.ArrayList;
 import java.util.Comparator;
 
 public class Person implements Comparable<Person>, Comparator<Person> {
@@ -6,13 +7,25 @@ public class Person implements Comparable<Person>, Comparator<Person> {
     private Size size;
     private Weight weight;
     private Eye eye;
+    //List of persons in the database to compare to.
+    private ArrayList<Person> personArrayList;
 
-    Person(Firstname firstname, Origin origin, Size size, Weight weight, Eye eye) {
-        setFirstname(firstname);
-        setOrigin(origin);
-        setPersonSize(size);
-        setWeight(weight);
-        setEye(eye);
+    Person() {
+        setFirstname(new Firstname());
+        setOrigin(new Origin());
+        setPersonSize(new Size());
+        setWeight(new Weight());
+        setEye(new Eye());
+        setPersonArrayList(new ArrayList<>());
+    }
+
+    Person(String firstname, String country, Integer size, Integer weight, String colorEye) {
+        setFirstname(new Firstname(firstname));
+        setOrigin(new Origin(country));
+        setPersonSize(new Size(size));
+        setWeight(new Weight(weight));
+        setEye(new Eye(colorEye));
+        setPersonArrayList(new ArrayList<>());
     }
 
     public void setFirstname(Firstname firstname) {
@@ -55,6 +68,14 @@ public class Person implements Comparable<Person>, Comparator<Person> {
         return eye;
     }
 
+    public void setPersonArrayList(ArrayList<Person> personArrayList) {
+        this.personArrayList = personArrayList;
+    }
+
+    public ArrayList<Person> getPersonArrayList() {
+        return personArrayList;
+    }
+
     @Override
     public int compareTo(Person person) {
         return this.firstname.compareTo(person.getFirstname()) + this.origin.compareTo(person.getOrigin())
@@ -63,7 +84,7 @@ public class Person implements Comparable<Person>, Comparator<Person> {
     }
 
     @Override
-    public int compare(Person person, Person t1) {
-        return 0;
+    public int compare(Person p1, Person p2) {
+        return p1.compareTo(p2);
     }
 }