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
/
Size.java
diff --git
a/src/Size.java
b/src/Size.java
index e665140b9f83c020a1f23ea1dc973ea45ccdbd22..eb8003f542104a9249658a2b118a8f758c0f8814 100644
(file)
--- a/
src/Size.java
+++ b/
src/Size.java
@@
-1,6
+1,7
@@
-public class Size
implements Comparable<Size>
{
+public class Size {
private int max = 240;
private int max = 240;
- private int min = 20;
+ private int min = 40;
+ private int defaultSize = 160;
private int size;
Size() {
private int size;
Size() {
@@
-10,6
+11,18
@@
public class Size implements Comparable<Size> {
setSize(size);
}
setSize(size);
}
+ public int getMin() {
+ return min;
+ }
+
+ public int getMax() {
+ return max;
+ }
+
+ public int getDefaultSize() {
+ return defaultSize;
+ }
+
public int getSize() {
return size;
}
public int getSize() {
return size;
}
@@
-18,21
+31,16
@@
public class Size implements Comparable<Size> {
if (validateSize(size)) {
this.size = size;
} else {
if (validateSize(size)) {
this.size = size;
} else {
- throw new IllegalArgumentException("Size must be between " + this.
min + " and " + this.max
);
+ throw new IllegalArgumentException("Size must be between " + this.
getMin() + " and " + this.getMax()
);
}
}
private boolean validateSize(int size) {
}
}
private boolean validateSize(int size) {
- return (size >=
min && size <= max
);
+ return (size >=
getMin() && size <= getMax()
);
}
}
- @Override
- public int compareTo(Size size) {
- int distance = size.size - this.getSize();
- if (distance >= 0)
- return distance;
- else
- return -distance;
-
+ public int distanceTo(Size size) {
+ int distance = size.getSize() - this.getSize();
+ return Math.abs(distance);
}
}
}
}