fix: correct validation of minimum and maximum ages

[gigi.git] / src / club / wpia / gigi / util / CalendarUtil.java

diff --git a/src/club/wpia/gigi/util/CalendarUtil.java b/src/club/wpia/gigi/util/CalendarUtil.java
index 6ff7bb291d8a6f2d5a6a5f5262a8dfb4cbb1e265..c7b2bb0faef15015a59545606417692db72f7a8b 100644 (file)
--- a/src/club/wpia/gigi/util/CalendarUtil.java
+++ b/src/club/wpia/gigi/util/CalendarUtil.java
@@ -16,12 +16,12 @@ public class CalendarUtil {
     }
 
     public static boolean isOfAge(DayDate dob, int age) {
+        return isYearsInFuture(dob.start(), age);
+    }
+
+    public static boolean isYearsInFuture(Date dt, int age) {
         Calendar c = Calendar.getInstance();
-        c.setTimeInMillis(dob.getTime());
-        int year = c.get(Calendar.YEAR);
-        int month = c.get(Calendar.MONTH);
-        int day = c.get(Calendar.DAY_OF_MONTH);
-        c.set(year, month, day);
+        c.setTime(dt);
         c.add(Calendar.YEAR, age);
 
         return System.currentTimeMillis() >= c.getTime().getTime();