repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add listener to specific events like country selection.
[Persons_Comparator.git]
/
src
/
Eye.java
diff --git
a/src/Eye.java
b/src/Eye.java
index ed2231b7aaa81da839726fea50b760f917f178f3..59612440812c342dd6dd929b91936de79363d337 100644
(file)
--- a/
src/Eye.java
+++ b/
src/Eye.java
@@
-1,17
+1,34
@@
import java.awt.Color;
import java.awt.Color;
+import java.util.Arrays;
public class Eye implements Comparable<Eye> {
public class Eye implements Comparable<Eye> {
+ private String strColor;
private Color color;
private Color color;
- private String[] colorsList = {"black", "
green", "blue", "brow
n"};
+ private String[] colorsList = {"black", "
blue", "brown", "gree
n"};
Eye() {
Eye() {
+ sortColorList();
}
/**
* @param color
*/
Eye(String color) {
}
/**
* @param color
*/
Eye(String color) {
+ setStrColor(color);
setColor(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() {
}
public String[] getColorsList() {
@@
-34,9
+51,8
@@
public class Eye implements Comparable<Eye> {
this.color = new Color(88, 41, 0);
else
this.color = Color.getColor(color);
this.color = new Color(88, 41, 0);
else
this.color = Color.getColor(color);
-
} else {
} else {
- throw new IllegalArgumentException("Color must be
" + colorsList
);
+ throw new IllegalArgumentException("Color must be
" + this.colorListToString()
);
}
}
}
}
@@
-53,6
+69,10
@@
public class Eye implements Comparable<Eye> {
return false;
}
return false;
}
+ private void sortColorList() {
+ Arrays.sort(this.colorsList);
+ }
+
/**
* @param eye
* @return
/**
* @param eye
* @return
@@
-66,4
+86,13
@@
public class Eye implements Comparable<Eye> {
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();
}
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();
}
+
+ private String colorListToString() {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (String c : colorsList) {
+ stringBuilder.append(" ");
+ stringBuilder.append(c);
+ }
+ return stringBuilder.toString();
+ }
}
}