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

diff --git a/src/Eye.java b/src/Eye.java
index bf83b8a..5177333 100644
--- a/src/Eye.java
+++ b/src/Eye.java
@@ -1,17 +1,35 @@
 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", "green", "blue", "brown"};
+    private String[] colorsList = {"black", "blue", "brown", "green"};
 
     Eye() {
+        //this.color = Color.white;
+        sortColorList();
     }
 
     /**
      * @param color
      */
     Eye(String color) {
+        setStrColor(color);
         setColor(color);
+        sortColorList();
+    }
+
+    public String getStrColor() {
+        return strColor;
+    }
+
+    public void setStrColor(String strColor) {
+        if (validateColor(strColor)) {
+            this.strColor = strColor;
+        } else {
+            throw new IllegalArgumentException("Color must be" + this.colorListToString());
+        }
     }
 
     public String[] getColorsList() {
@@ -30,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().toString());
+            throw new IllegalArgumentException("Color must be" + this.colorListToString());
         }
     }
 
@@ -53,12 +74,15 @@ public class Eye implements Comparable<Eye> {
         return false;
     }
 
+    private void sortColorList() {
+        Arrays.sort(this.colorsList);
+    }
+
     /**
      * @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();
@@ -67,8 +91,7 @@ public class Eye implements Comparable<Eye> {
         return distance.intValue();
     }
 
-    @Override
-    public String toString() {
+    private String colorListToString() {
         StringBuilder stringBuilder = new StringBuilder();
         for (String c : colorsList) {
             stringBuilder.append(" ");