Author: bleny Date: 2011-04-04 12:50:57 +0000 (Mon, 04 Apr 2011) New Revision: 1134 Log: last minute dirty hack to avoid release with snapshot dependency 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 12:39:47 UTC (rev 1133) +++ trunk/pom.xml 2011-04-04 12:50:57 UTC (rev 1134) @@ -312,7 +312,7 @@ <!-- libraries version --> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1</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 12:39:47 UTC (rev 1133) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-04-04 12:50:57 UTC (rev 1134) @@ -31,6 +31,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.slf4j.Logger; @@ -39,6 +40,7 @@ import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -255,4 +257,28 @@ } 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 12:39:47 UTC (rev 1133) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-04 12:50:57 UTC (rev 1134) @@ -35,6 +35,7 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.FacadeRowImpl; @@ -1394,8 +1395,8 @@ fromDate = DateUtils.addMonths(fromDate, -6); toDate = DateUtils.addMonths(toDate, 6); } else { - fromDate = DateUtil.setFirstDayOfYear(fromDate); - toDate = DateUtil.setLastDayOfYear(toDate); + fromDate = WaoUtils.setFirstDayOfYear(fromDate); + toDate = WaoUtils.setLastDayOfYear(toDate); } fromDate = DateUtil.setMinTimeOfDay(fromDate);