X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FPerson.java;h=d1ceb350724cbae919c3642f77b51fa8548278f2;hb=ac6c3ea2922a7d424c1244809f68026c5a77bcdf;hp=f0e5c6bc58fd5f3c8e24de2692e854b80ee96e97;hpb=613054ac3144a04ab284e159b610317eacf67e1f;p=Persons_Comparator.git

diff --git a/src/Person.java b/src/Person.java
index f0e5c6b..d1ceb35 100644
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,14 +1,18 @@
-import javax.swing.*;
+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;
 
-    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) {
@@ -57,4 +61,9 @@ public class Person extends JPanel implements Comparable<Person> {
                 + 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);
+    }
 }