X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FSize.java;h=a61f24cb79769b34c3a8e8b502542621232a81ed;hb=2bb2aa17b6533b2e8d2fc97997ed76bc38b6931d;hp=20e96f6b47f04c7c9e330aec7a271e4b54aad289;hpb=613054ac3144a04ab284e159b610317eacf67e1f;p=Persons_Comparator.git diff --git a/src/Size.java b/src/Size.java index 20e96f6..a61f24c 100644 --- a/src/Size.java +++ b/src/Size.java @@ -1,14 +1,23 @@ -import java.util.Comparator; - public class Size implements Comparable { private int max = 240; - private int min = 20; + private int min = 40; private int size; + Size() { + } + Size(int size) { setSize(size); } + public int getMin() { + return min; + } + + public int getMax() { + return max; + } + public int getSize() { return size; } @@ -17,17 +26,17 @@ public class Size implements Comparable { 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) { - return (size > max || size < min); + return (size >= getMin() && size <= getMax()); } @Override public int compareTo(Size size) { - int distance = size.size - this.getSize(); + int distance = size.getSize() - this.getSize(); if (distance >= 0) return distance; else