Author: bleny Date: 2011-04-04 14:14:10 +0000 (Mon, 04 Apr 2011) New Revision: 1138 Log: remove code cloned from DateUtil and use DateUtil Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-04 13:08:58 UTC (rev 1137) +++ trunk/pom.xml 2011-04-04 14:14:10 UTC (rev 1138) @@ -312,7 +312,7 @@ <!-- libraries version --> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3.3</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-04-04 13:08:58 UTC (rev 1137) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-04-04 14:14:10 UTC (rev 1138) @@ -258,27 +258,4 @@ return existingEntity; } - - /** - * @deprecated replace by DateUtil 2.2 - */ - @Deprecated - public static Date setLastDayOfYear(Date date) { - Calendar calendar = DateUtil.getDefaultCalendar(date); - int maximum = calendar.getActualMaximum(Calendar.DAY_OF_YEAR); - calendar.set(Calendar.DAY_OF_YEAR, maximum); - Date lastDay = calendar.getTime(); - return lastDay; - } - - /** - * @deprecated replace by DateUtil 2.2 - */ - @Deprecated - public static Date setFirstDayOfYear(Date date) { - Calendar calendar = DateUtil.getDefaultCalendar(date); - calendar.set(Calendar.DAY_OF_YEAR, 1); - Date firstDay = calendar.getTime(); - return firstDay; - } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-04 13:08:58 UTC (rev 1137) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-04 14:14:10 UTC (rev 1138) @@ -1395,8 +1395,8 @@ fromDate = DateUtils.addMonths(fromDate, -6); toDate = DateUtils.addMonths(toDate, 6); } else { - fromDate = WaoUtils.setFirstDayOfYear(fromDate); - toDate = WaoUtils.setLastDayOfYear(toDate); + fromDate = DateUtil.setFirstDayOfYear(fromDate); + toDate = DateUtil.setLastDayOfYear(toDate); } fromDate = DateUtil.setMinTimeOfDay(fromDate);