chg: adjust ticket number handling according to current number scheme

[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..9c4cf70ae66bf1392d8712ee5c6e2ac8927e1bca 100644 (file)
--- a/src/club/wpia/gigi/util/CalendarUtil.java
+++ b/src/club/wpia/gigi/util/CalendarUtil.java
@@ -15,13 +15,24 @@ public class CalendarUtil {
 
     }
 
 
     }
 

+    /**
+     * @param date
+     *            YYYYMMDD
+     */
+    public static boolean isDateValid(String date) {
+        int year = Integer.parseInt(date.substring(0, 4));
+        int month = Integer.parseInt(date.substring(4, 6));
+        int day = Integer.parseInt(date.substring(6, 8));
+        return isDateValid(year, month, day);
+    }
+

     public static boolean isOfAge(DayDate dob, int age) {
     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();
         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();
         c.add(Calendar.YEAR, age);
 
         return System.currentTimeMillis() >= c.getTime().getTime();