Make Person class and attributes implements Comparable.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/Eye.java b/src/Eye.java
index b02dbfcac2602262801fe521b123cc8234e4f253..abbbfb70fabbc21f35cd3aca57a2d5f7397326f8 100644 (file)
--- a/src/Eye.java
+++ b/src/Eye.java
@@ -1,9 +1,11 @@
 import java.awt.Color;
+import java.util.List;
 
-public class Eye {
+public class Eye implements Comparable<Eye> {
     private Color color;
+    private List<Color> colorList;
 
-    Eye(Color color) {
+    Eye(String color) {
         setColor(color);
     }
 
@@ -11,7 +13,12 @@ public class Eye {
         return color;
     }
 
-    public void setColor(Color color) {
-        this.color = color;
+    public void setColor(String color) {
+        this.color = Color.getColor(color);
+    }
+
+    @Override
+    public int compareTo(Eye eye) {
+        return 0;
     }
 }

diff --git a/src/Firstname.java b/src/Firstname.java
index 2535c0e3844d4df03d834c9937e36c947770b4d2..91e8d75012fe828bf042323a99d08f6899ccbf7a 100644 (file)
--- a/src/Firstname.java
+++ b/src/Firstname.java
@@ -1,4 +1,4 @@
-public class Firstname {
+public class Firstname implements Comparable<Firstname> {
     private String firstname;
 
     public String getFirstname() {
@@ -8,4 +8,9 @@ public class Firstname {
     public void setFirstname(String firstname) {
         this.firstname = firstname;
     }
+
+    @Override
+    public int compareTo(Firstname firstname) {
+        return 0;
+    }
 }

diff --git a/src/Origin.java b/src/Origin.java
index 72ecd832a6999acd5cfd49ba30ae1bf65b6f7498..60e7fc9e641a40a6690458dffa0e1f8395469f59 100644 (file)
--- a/src/Origin.java
+++ b/src/Origin.java
@@ -1,4 +1,4 @@
-public class Origin {
+public class Origin implements Comparable<Origin> {
     private String country;
 
     Origin(String country) {
@@ -12,4 +12,9 @@ public class Origin {
     public void setCountry(String country) {
         this.country = country;
     }
+
+    @Override
+    public int compareTo(Origin origin) {
+        return 0;
+    }
 }

diff --git a/src/Person.java b/src/Person.java
index 56a02a886701ff108f2020169d9b9926b1a8ec7b..387e921dc72689881b21f329e828b242e17ed306 100644 (file)
--- a/src/Person.java
+++ b/src/Person.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
 
-public class Person extends JPanel {
+public class Person extends JPanel implements Comparable<Person> {
     private Firstname firstname;
     private Origin origin;
     private Size size;
@@ -50,4 +50,9 @@ public class Person extends JPanel {
     public Eye getEye() {
         return eye;
     }
+
+    @Override
+    public int compareTo(Person person) {
+        return 0;
+    }
 }

diff --git a/src/Size.java b/src/Size.java
index dfea96cdd8226c8dba12b50fa86423ceb2635658..a526fab6a01a3fb9ce5d5ce31b5f39aef3d3bae2 100644 (file)
--- a/src/Size.java
+++ b/src/Size.java
@@ -1,5 +1,6 @@
+import java.util.Comparator;
 
-public class Size {
+public class Size implements Comparable<Size> {
     private int max = 240;
     private int min = 20;
     private int size;
@@ -23,4 +24,9 @@ public class Size {
     private boolean validateSize(int size) {
         return (size > max || size < min);
     }
+
+    @Override
+    public int compareTo(Size size) {
+        return 0;
+    }
 }

diff --git a/src/Weight.java b/src/Weight.java
index 2a8c8127d7cb17f63cbe5aa8e6a98a26209a3f24..b0264faa591187841e4345f0a94b00e0d9347f63 100644 (file)
--- a/src/Weight.java
+++ b/src/Weight.java
@@ -1,4 +1,4 @@
-public class Weight {
+public class Weight implements Comparable<Weight> {
     private int weight;
 
     Weight(int weight) {
@@ -20,4 +20,9 @@ public class Weight {
     private boolean validateWeight(int weight) {
         return (weight > 0);
     }
+
+    @Override
+    public int compareTo(Weight weight) {
+        return 0;
+    }
 }