repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a label to all views.
[Persons_Comparator.git]
/
src
/
Eye.java
diff --git
a/src/Eye.java
b/src/Eye.java
index 6edc8a563d99af95b373270e2936592551bcf2c7..a165830f8a1f3cb67354d4c3a97fe48951798c90 100644
(file)
--- a/
src/Eye.java
+++ b/
src/Eye.java
@@
-1,10
+1,11
@@
import java.awt.Color;
import java.awt.Color;
-import java.util.List;
-import java.util.Arrays;
public class Eye implements Comparable<Eye> {
private Color color;
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
/**
* @param color
@@
-13,6
+14,10
@@
public class Eye implements Comparable<Eye> {
setColor(color);
}
setColor(color);
}
+ public String[] getColorsList() {
+ return colorsList;
+ }
+
/**
* @return
*/
/**
* @return
*/
@@
-31,7
+36,7
@@
public class Eye implements Comparable<Eye> {
this.color = Color.getColor(color);
} else {
this.color = Color.getColor(color);
} else {
- throw new IllegalArgumentException("Color must be " + color
List.toString()
);
+ throw new IllegalArgumentException("Color must be " + color
sList
);
}
}
}
}
@@
-40,7
+45,12
@@
public class Eye implements Comparable<Eye> {
* @return
*/
private boolean validateColor(String color) {
* @return
*/
private boolean validateColor(String color) {
- return colorList.contains(color);
+ for (String c : colorsList) {
+ if (color.equals(c)) {
+ return true;
+ }
+ }
+ return false;
}
/**
}
/**