X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FSize.java;h=eb8003f542104a9249658a2b118a8f758c0f8814;hb=5687dc10a68b52d28b63151d8c16a45775ef2e77;hp=20e96f6b47f04c7c9e330aec7a271e4b54aad289;hpb=613054ac3144a04ab284e159b610317eacf67e1f;p=Persons_Comparator.git

diff --git a/src/Size.java b/src/Size.java
index 20e96f6..eb8003f 100644
--- a/src/Size.java
+++ b/src/Size.java
@@ -1,14 +1,28 @@
-import java.util.Comparator;
-
-public class Size implements Comparable<Size> {
+public class Size {
     private int max = 240;
-    private int min = 20;
+    private int min = 40;
+    private int defaultSize = 160;
     private int size;
 
+    Size() {
+    }
+
     Size(int size) {
         setSize(size);
     }
 
+    public int getMin() {
+        return min;
+    }
+
+    public int getMax() {
+        return max;
+    }
+
+    public int getDefaultSize() {
+        return defaultSize;
+    }
+
     public int getSize() {
         return size;
     }
@@ -17,21 +31,16 @@ public class Size implements Comparable<Size> {
         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();
-        if (distance >= 0)
-            return distance;
-        else
-            return -distance;
-
+    public int distanceTo(Size size) {
+        int distance = size.getSize() - this.getSize();
+        return Math.abs(distance);
     }
 }