X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FPerson.java;h=d1ceb350724cbae919c3642f77b51fa8548278f2;hb=0fc8383b05684d5d760a2ba82ab33479dbdd5103;hp=56a02a886701ff108f2020169d9b9926b1a8ec7b;hpb=9749119587561f5848349b7a1b9e7d9342944f0d;p=Persons_Comparator.git

diff --git a/src/Person.java b/src/Person.java
index 56a02a8..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 {
+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) {
@@ -50,4 +54,16 @@ public class Person extends JPanel {
     public Eye getEye() {
         return eye;
     }
+
+    @Override
+    public int compareTo(Person person) {
+        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);
+    }
 }