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

diff --git a/src/Person.java b/src/Person.java
index 387e921..c0483f8 100644
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,14 +1,31 @@
-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) {
-        setFirstname(firstname);
+    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) {
@@ -51,8 +68,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);
     }
 }