X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FPerson.java;h=3e6788ffac59805d10321c8671f96d2e8c6bf6cb;hb=f1e9d6d2fcc7253b117278c4439b656a1e532e68;hp=387e921dc72689881b21f329e828b242e17ed306;hpb=1c1189337121a1baa74961813e619c99b398a333;p=Persons_Comparator.git

diff --git a/src/Person.java b/src/Person.java
index 387e921..3e6788f 100644
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,14 +1,21 @@
-import javax.swing.*;
+import java.util.ArrayList;
+import java.util.Comparator;
 
-public class Person extends JPanel implements Comparable<Person> {
+public class Person implements Comparable<Person>, Comparator<Person> {
     private Firstname firstname;
     private Origin origin;
     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) {
+    Person(Firstname firstname, Origin origin, Size size, Weight weight, Eye eye) {
         setFirstname(firstname);
+        setOrigin(origin);
+        setPersonSize(size);
+        setWeight(weight);
+        setEye(eye);
     }
 
     public void setFirstname(Firstname firstname) {
@@ -51,8 +58,23 @@ public class Person extends JPanel implements Comparable<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 0;
+        return this.firstname.compareTo(person.getFirstname()) + this.origin.compareTo(person.getOrigin())
+                + this.size.compareTo(person.getPersonSize()) + this.weight.compareTo(person.getWeight())
+                + this.eye.compareTo(person.getEye());
+    }
+
+    @Override
+    public int compare(Person p1, Person p2) {
+        return p1.compareTo(p2);
     }
 }