Author: tchemit Date: 2010-08-29 16:38:34 +0200 (Sun, 29 Aug 2010) New Revision: 1910 Url: http://nuiton.org/repositories/revision/nuiton-utils/1910 Log: Evolution #831: Deprecates DateUtils in favour to DateUtil Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-08-29 14:34:29 UTC (rev 1909) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-08-29 14:38:34 UTC (rev 1910) @@ -58,7 +58,7 @@ setFromDate(fromDate); setThruDate(thruDate); - pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtil.DEFAULT_PATTERN; } public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) throws IllegalArgumentException { @@ -68,7 +68,7 @@ this.fromCalendar = fromCalendar; this.thruCalendar = thruCalendar; - pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtil.DEFAULT_PATTERN; } /** @@ -95,7 +95,7 @@ Calendar calendarThru = Calendar.getInstance(); // Reset time - Date minTime = DateUtils.setMinTimeOfDay(new Date()); + Date minTime = DateUtil.setMinTimeOfDay(new Date()); calendarFrom.setTime(minTime); calendarThru.setTime(minTime); @@ -107,7 +107,7 @@ PeriodDates period = new PeriodDates(calendarFrom, calendarThru); period.initDayOfMonthExtremities(); - period.setPattern(DateUtils.MONTH_PATTERN); + period.setPattern(DateUtil.MONTH_PATTERN); return period; } @@ -181,13 +181,13 @@ // Prepare calendars for while condition : // set first day of month + reset time to 00:00:00.000 - Date tmp = DateUtils.setFirstDayOfMonth(fromCalendar.getTime()); - tmp = DateUtils.setMinTimeOfDay(tmp); - Calendar current = DateUtils.getDefaultCalendar(tmp); + Date tmp = DateUtil.setFirstDayOfMonth(fromCalendar.getTime()); + tmp = DateUtil.setMinTimeOfDay(tmp); + Calendar current = DateUtil.getDefaultCalendar(tmp); - tmp = DateUtils.setFirstDayOfMonth(thruCalendar.getTime()); - tmp = DateUtils.setMinTimeOfDay(tmp); - Calendar end = DateUtils.getDefaultCalendar(tmp); + tmp = DateUtil.setFirstDayOfMonth(thruCalendar.getTime()); + tmp = DateUtil.setMinTimeOfDay(tmp); + Calendar end = DateUtil.getDefaultCalendar(tmp); while (!current.equals(end)) { months.add(current.getTime()); @@ -201,7 +201,7 @@ public List<String> getFormatedMonths() { List<String> results = new ArrayList<String>(); for (Date date : getMonths()) { - String str = DateUtils.formatDate(date, pattern); + String str = DateUtil.formatDate(date, pattern); results.add(str); } return results; @@ -224,30 +224,30 @@ } public boolean beforeEnd(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return beforeEnd(calendar); } public boolean afterEnd(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return afterEnd(calendar); } public boolean afterBegin(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return afterBegin(calendar); } public boolean between(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return between(calendar); } @Override public String toString() { - String fromStr = DateUtils.formatDate(getFromDate(), pattern); - String thruStr = DateUtils.formatDate(getThruDate(), pattern); + String fromStr = DateUtil.formatDate(getFromDate(), pattern); + String thruStr = DateUtil.formatDate(getThruDate(), pattern); return "[ " + getFromDate() + " (pattern: " + fromStr + ") -> " + getThruDate() + " (pattern: " + thruStr + ") ]"; } Modified: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-08-29 14:34:29 UTC (rev 1909) +++ trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-08-29 14:38:34 UTC (rev 1910) @@ -122,7 +122,7 @@ log.info("getMonths"); // Prepare two calendars with time not equals to 0 - Calendar cal1 = DateUtils.getDefaultCalendar(new Date()); + Calendar cal1 = DateUtil.getDefaultCalendar(new Date()); cal1.set(Calendar.DAY_OF_MONTH, 3); cal1.set(Calendar.MONTH, 2); cal1.set(Calendar.YEAR, 2009); @@ -132,7 +132,7 @@ log.info("getMonths:: time for calendarFrom : " + timeFormat.format(cal1.getTime())); - Calendar cal2 = DateUtils.getDefaultCalendar(new Date()); + Calendar cal2 = DateUtil.getDefaultCalendar(new Date()); cal2.set(Calendar.DAY_OF_MONTH, 22); cal2.set(Calendar.MONTH, 6); cal2.set(Calendar.YEAR, 2009); @@ -147,7 +147,7 @@ Assert.assertEquals(5, months.size()); for (int i = 0; i < 5; i++) { Date monthDate = months.get(i); - int month = DateUtils.getDefaultCalendar(monthDate).get(Calendar.MONTH); + int month = DateUtil.getDefaultCalendar(monthDate).get(Calendar.MONTH); Assert.assertEquals(i + 2, month); // 2, 3, 4, 5, 6 } }