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

diff --git a/src/Eye.java b/src/Eye.java
index c3b836d..bf83b8a 100644
--- a/src/Eye.java
+++ b/src/Eye.java
@@ -1,21 +1,24 @@
 import java.awt.Color;
-import java.util.List;
-import java.util.Arrays;
 
 public class Eye implements Comparable<Eye> {
     private Color color;
-    private List<String> colorList = Arrays.asList("black", "green", "blue", "brown");
+    private String[] colorsList = {"black", "green", "blue", "brown"};
+
+    Eye() {
+    }
 
     /**
-     *
      * @param color
      */
     Eye(String color) {
         setColor(color);
     }
 
+    public String[] getColorsList() {
+        return colorsList;
+    }
+
     /**
-     *
      * @return
      */
     public Color getColor() {
@@ -23,7 +26,6 @@ public class Eye implements Comparable<Eye> {
     }
 
     /**
-     *
      * @param color
      */
     public void setColor(String color) {
@@ -34,21 +36,24 @@ public class Eye implements Comparable<Eye> {
                 this.color = Color.getColor(color);
 
         } else {
-            throw new IllegalArgumentException("Color must be " + colorList.toString());
+            throw new IllegalArgumentException("Color must be" + new Eye().toString());
         }
     }
 
     /**
-     *
      * @param color
      * @return
      */
     private boolean validateColor(String color) {
-        return colorList.contains(color);
+        for (String c : colorsList) {
+            if (color.equals(c)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
-     *
      * @param eye
      * @return
      */
@@ -57,8 +62,18 @@ public class Eye implements Comparable<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();
-        // See https://en.wikipedia.org/wiki/Color_difference
+        //See https://en.wikipedia.org/wiki/Color_difference
         Double distance = Math.sqrt(2 * Math.pow(r_diff, 2) + 4 * Math.pow(g_diff, 2) + 3 * Math.pow(b_diff, 2));
         return distance.intValue();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String c : colorsList) {
+            stringBuilder.append(" ");
+            stringBuilder.append(c);
+        }
+        return stringBuilder.toString();
+    }
 }