repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add Levenshtein distance to Firstname class Comparable.
[Persons_Comparator.git]
/
src
/
Eye.java
diff --git
a/src/Eye.java
b/src/Eye.java
index 595d3d3990da3e71fa5cbf403ffde791e81704f5..c3b836d0046eccc52afc27217ef72b379df51ec9 100644
(file)
--- a/
src/Eye.java
+++ b/
src/Eye.java
@@
-6,29
+6,52
@@
public class Eye implements Comparable<Eye> {
private Color color;
private List<String> colorList = Arrays.asList("black", "green", "blue", "brown");
private Color color;
private List<String> colorList = Arrays.asList("black", "green", "blue", "brown");
+ /**
+ *
+ * @param color
+ */
Eye(String color) {
setColor(color);
}
Eye(String color) {
setColor(color);
}
+ /**
+ *
+ * @return
+ */
public Color getColor() {
return color;
}
public Color getColor() {
return color;
}
+ /**
+ *
+ * @param color
+ */
public void setColor(String color) {
if (validateColor(color)) {
public void setColor(String color) {
if (validateColor(color)) {
- if (color != "brown")
- this.color = Color.getColor(color);
- else
+ if (color.equals("brown"))
this.color = new Color(88, 41, 0);
this.color = new Color(88, 41, 0);
+ else
+ this.color = Color.getColor(color);
+
} else {
throw new IllegalArgumentException("Color must be " + colorList.toString());
}
}
} else {
throw new IllegalArgumentException("Color must be " + colorList.toString());
}
}
+ /**
+ *
+ * @param color
+ * @return
+ */
private boolean validateColor(String color) {
return colorList.contains(color);
}
private boolean validateColor(String color) {
return colorList.contains(color);
}
+ /**
+ *
+ * @param eye
+ * @return
+ */
@Override
public int compareTo(Eye eye) {
double r_diff = this.getColor().getRed() - eye.getColor().getRed();
@Override
public int compareTo(Eye eye) {
double r_diff = this.getColor().getRed() - eye.getColor().getRed();