X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FPerson.java;h=4eabb1b9b651a662d6994799bbab666b78cae90f;hb=9b3bfcdd95253a04ed12a676ee29a9d777c1e496;hp=9c30e56c9e4e5d3055f7e1bea97466520a86597a;hpb=6977e6142a133673703769e092e6283dda73cf4f;p=Persons_Comparator.git

diff --git a/src/Person.java b/src/Person.java
index 9c30e56..4eabb1b 100644
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,4 +1,6 @@
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.ListIterator;
 
 public class Person implements Comparable<Person>, Comparator<Person> {
     private Firstname firstname;
@@ -6,13 +8,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 +69,38 @@ 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;
+    }
+
+    public void displayArrayList(ArrayList arrayList) {
+        ListIterator iter = arrayList.listIterator();
+        Integer i = 0;
+        while (iter.hasNext()) {
+            System.out.println(i.toString() + " " + iter.next());
+            i++;
+        }
+    }
+
+    public void displayPersonArrayList() {
+        this.displayArrayList(this.personArrayList);
+    }
+
+    @Override
+    public String toString() {
+        return "Person{" +
+                "firstname=" + firstname.getFirstname() +
+                ", origin=" + origin.getCountry() +
+                ", size=" + size.getSize() +
+                ", weight=" + weight.getWeight() +
+                ", eye=" + eye.getStrColor() + "(" + this.getEye().getColor().getRed() + "," + this.getEye().getColor().getGreen() + "," + this.getEye().getColor().getBlue() + ")" +
+                '}';
+    }
+
     @Override
     public int compareTo(Person person) {
         return this.firstname.compareTo(person.getFirstname()) + this.origin.compareTo(person.getOrigin())
@@ -63,7 +109,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);
     }
 }