repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement the person comparator :
[Persons_Comparator.git]
/
src
/
Eye.java
diff --git
a/src/Eye.java
b/src/Eye.java
index 6b71f354d6cd9e3d8a7bb043680efda045a1b573..822e6f83dd3fc7aabc5bcf5d864671c828c6f999 100644
(file)
--- a/
src/Eye.java
+++ b/
src/Eye.java
@@
-1,7
+1,7
@@
import java.awt.Color;
import java.util.Arrays;
import java.awt.Color;
import java.util.Arrays;
-public class Eye
implements Comparable<Eye>
{
+public class Eye {
private String strColor;
private Color color;
private String[] colorsList = {"black", "blue", "brown", "green"};
private String strColor;
private Color color;
private String[] colorsList = {"black", "blue", "brown", "green"};
@@
-27,7
+27,7
@@
public class Eye implements Comparable<Eye> {
if (validateColor(strColor)) {
this.strColor = strColor;
} else {
if (validateColor(strColor)) {
this.strColor = strColor;
} else {
- throw new IllegalArgumentException("Color must be" +
new Eye()
.colorListToString());
+ throw new IllegalArgumentException("Color must be" +
this
.colorListToString());
}
}
}
}
@@
-47,13
+47,16
@@
public class Eye implements Comparable<Eye> {
*/
public void setColor(String color) {
if (validateColor(color)) {
*/
public void setColor(String color) {
if (validateColor(color)) {
- if (color.equals("brown"))
+ if (color.equals("black"))
+ this.color = Color.black;
+ else if (color.equals("blue"))
+ this.color = Color.blue;
+ 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 if (color.equals("green"))
+ this.color = Color.green;
} else {
} else {
- throw new IllegalArgumentException("Color must be" +
new Eye()
.colorListToString());
+ throw new IllegalArgumentException("Color must be" +
this
.colorListToString());
}
}
}
}
@@
-78,8
+81,7
@@
public class Eye implements Comparable<Eye> {
* @param eye
* @return
*/
* @param eye
* @return
*/
- @Override
- public int compareTo(Eye eye) {
+ public int distanceTo(Eye 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();
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();