X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FEye.java;h=a165830f8a1f3cb67354d4c3a97fe48951798c90;hb=883508cad71557d375580ce52a4e093f131405db;hp=c3b836d0046eccc52afc27217ef72b379df51ec9;hpb=ac6c3ea2922a7d424c1244809f68026c5a77bcdf;p=Persons_Comparator.git diff --git a/src/Eye.java b/src/Eye.java index c3b836d..a165830 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 { private Color color; - private List 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 { } /** - * * @param color */ public void setColor(String color) { @@ -34,21 +36,24 @@ public class Eye implements Comparable { this.color = Color.getColor(color); } else { - throw new IllegalArgumentException("Color must be " + colorList.toString()); + throw new IllegalArgumentException("Color must be " + colorsList); } } /** - * * @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 */