X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FEye.java;h=5177333340ccaae5405fce6264d927319ef3aa16;hb=7add5cb9b2213df01b559a59f39b033e27f50e72;hp=6b71f354d6cd9e3d8a7bb043680efda045a1b573;hpb=d75d0a00d45e0f62b494a7282a5902e63df32b1a;p=Persons_Comparator.git

diff --git a/src/Eye.java b/src/Eye.java
index 6b71f35..5177333 100644
--- a/src/Eye.java
+++ b/src/Eye.java
@@ -1,12 +1,13 @@
 import java.awt.Color;
 import java.util.Arrays;
 
-public class Eye implements Comparable<Eye> {
+public class Eye {
     private String strColor;
     private Color color;
     private String[] colorsList = {"black", "blue", "brown", "green"};
 
     Eye() {
+        //this.color = Color.white;
         sortColorList();
     }
 
@@ -27,7 +28,7 @@ public class Eye implements Comparable<Eye> {
         if (validateColor(strColor)) {
             this.strColor = strColor;
         } else {
-            throw new IllegalArgumentException("Color must be" + new Eye().colorListToString());
+            throw new IllegalArgumentException("Color must be" + this.colorListToString());
         }
     }
 
@@ -47,13 +48,16 @@ public class Eye implements Comparable<Eye> {
      */
     public void setColor(String color) {
         if (validateColor(color)) {
-            if (color.equals("brown"))
+            if (color.equals("black"))
+                this.color = Color.black;
+            else if (color.equals("blue"))
+                this.color = Color.blue;
+            else if (color.equals("brown"))
                 this.color = new Color(88, 41, 0);
-            else
-                this.color = Color.getColor(color);
-
+            else if (color.equals("green"))
+                this.color = Color.green;
         } else {
-            throw new IllegalArgumentException("Color must be" + new Eye().colorListToString());
+            throw new IllegalArgumentException("Color must be" + this.colorListToString());
         }
     }
 
@@ -78,8 +82,7 @@ public class Eye implements Comparable<Eye> {
      * @param eye
      * @return
      */
-    @Override
-    public int compareTo(Eye eye) {
+    public int distanceTo(Eye eye) {
         double r_diff = this.getColor().getRed() - eye.getColor().getRed();
         double g_diff = this.getColor().getGreen() - eye.getColor().getGreen();
         double b_diff = this.getColor().getBlue() - eye.getColor().getBlue();