[Suiviobsmer-commits] r651 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages

3 Oct 2010

Author: fdesbois
Date: 2010-10-03 15:20:28 +0000 (Sun, 03 Oct 2010)
New Revision: 651

Log:
Use DateUtil instead of DateUtils (deprecated in Nuiton-utils)

Modified:
   trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java
   trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java
   trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
   trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
   trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java

Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java
===================================================================

--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -25,7 +25,7 @@
 package fr.ifremer.wao.entity;
 
 import fr.ifremer.wao.bean.ContactState;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +60,7 @@
         Date beginDate = getTideBeginDate();
         Date endDate = getTideEndDate();
         if (beginDate != null && endDate != null) {
-            int nbDays = DateUtils.getDifferenceInDays(beginDate, endDate);
+            int nbDays = DateUtil.getDifferenceInDays(beginDate, endDate);
             // nbDays + 1 to have the first day
             setTideNbDays(nbDays + 1);
         }

Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -28,7 +28,7 @@
 import fr.ifremer.wao.service.ServiceSampling;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.time.DurationFormatUtils;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,9 +86,9 @@
 ////            if (ref.get(Calendar.MONTH) == (curr.getPeriodMonth()-1) && ref.get(Calendar.YEAR) == curr.getPeriodYear()) {
 ////                return curr;
 ////            }
-//            Date min = DateUtils.setFirstDayOfMonth(curr.getPeriodDate());
-//            Date max = DateUtils.setLastDayOfMonth(curr.getPeriodDate());
-//            if (DateUtils.between(date, min, max)) {
+//            Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate());
+//            Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate());
+//            if (DateUtil.between(date, min, max)) {
 //                return curr;
 //            }
 //        }
@@ -98,9 +98,9 @@
             return sampleMonthMap.get(dateFormatted);
         } else {
             for (SampleMonth curr : getSampleMonth()) {
-                Date min = DateUtils.setFirstDayOfMonth(curr.getPeriodDate());
-                Date max = DateUtils.setLastDayOfMonth(curr.getPeriodDate());
-                if (DateUtils.between(date, min, max)) {
+                Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate());
+                Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate());
+                if (DateUtil.between(date, min, max)) {
                     return curr;
                 }
             }

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	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -74,7 +74,7 @@
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.framework.TopiaQuery;
 import org.nuiton.topia.framework.TopiaQuery.Op;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -153,7 +153,7 @@
                 log.debug("samplRow topiaId : " + row.getTopiaId());
             }
 
-            String pattern = DateUtils.MONTH_PATTERN;
+            String pattern = DateUtil.MONTH_PATTERN;
             DateFormat dateFormat = new SimpleDateFormat(pattern);
 
             SampleRow oldRow = null;
@@ -1047,7 +1047,7 @@
             Integer monthValue = StringUtils.isEmpty(reader.get(i)) ?
                 null : Integer.parseInt(reader.get(i));
 
-            if (monthValue != null && DateUtils.between(monthDate,
+            if (monthValue != null && DateUtil.between(monthDate,
                     sampleRow.getPeriodBegin(), sampleRow.getPeriodEnd())) {
                 SampleMonthDAO dao =
                         WaoDAOHelper.getSampleMonthDAO(transaction);

Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -55,7 +55,7 @@
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.framework.TopiaQuery;
 import org.nuiton.topia.framework.TopiaQuery.Op;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -545,7 +545,7 @@
             Date rowDataInputDate = (Date)row[1];
             Date rowTideBeginDate = (Date)row[2];
 
-            int nbDays = DateUtils.getDifferenceInDays(rowTideBeginDate, rowDataInputDate);
+            int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate);
 
             if (logger.isDebugEnabled()) {
                 logger.debug("Company : " + rowCompanyName);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -46,7 +46,7 @@
 import org.junit.BeforeClass;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -563,7 +563,7 @@
         contact1.setObserver(user);
         contact1.setSampleRow(row);
         contact1.setContactState(ContactState.BOARDING_DONE);
-        Date begin = DateUtils.createDate(3, 3, 2010);
+        Date begin = DateUtil.createDate(3, 3, 2010);
         contact1.setTideBeginDate(begin);
         serviceContact.saveContact(contact1, false);
 
@@ -572,7 +572,7 @@
         contact2.setObserver(user);
         contact2.setSampleRow(row);
         contact2.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 10, 2010);
+        begin = DateUtil.createDate(3, 10, 2010);
         contact2.setTideBeginDate(begin);
         serviceContact.saveContact(contact2, false);
 
@@ -581,7 +581,7 @@
         contact3.setObserver(user);
         contact3.setSampleRow(row);
         contact3.setContactState(ContactState.BOAT_REFUSED);
-        begin = DateUtils.createDate(3, 5, 2010);
+        begin = DateUtil.createDate(3, 5, 2010);
         contact3.setTopiaCreateDate(begin);
         serviceContact.saveContact(contact3, false);
 
@@ -591,7 +591,7 @@
         contact4.setObserver(user2);
         contact4.setSampleRow(row2);
         contact4.setContactState(ContactState.BOARDING_EXPECTED);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact4.setTopiaCreateDate(begin);
         serviceContact.saveContact(contact4, false);
 
@@ -600,7 +600,7 @@
         contact5.setObserver(user2);
         contact5.setSampleRow(row2);
         contact5.setContactState(ContactState.BOAT_UNAVAILABLE);
-        begin = DateUtils.createDate(3, 5, 2010);
+        begin = DateUtil.createDate(3, 5, 2010);
         contact5.setTopiaCreateDate(begin);
         serviceContact.saveContact(contact5, false);
 
@@ -610,7 +610,7 @@
         contact6.setObserver(user2);
         contact6.setSampleRow(row2);
         contact6.setContactState(ContactState.BOAT_UNAVAILABLE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact6.setTopiaCreateDate(begin);
         contact6.setValidationProgram(Boolean.FALSE);
         serviceContact.saveContact(contact6, false);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -40,7 +40,7 @@
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.framework.TopiaQuery;
 import org.nuiton.util.ArgumentsParserException;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -130,8 +130,8 @@
             query.addGroup(sampleRow);
             
             for (SampleMonth month : curr.getSampleMonth()) {
-                Date begin = DateUtils.setFirstDayOfMonth(month.getPeriodDate());
-                Date end = DateUtils.setLastDayOfMonth(month.getPeriodDate());
+                Date begin = DateUtil.setFirstDayOfMonth(month.getPeriodDate());
+                Date end = DateUtil.setLastDayOfMonth(month.getPeriodDate());
                 
                 query.addWhere(tideBegin + " BETWEEN :begin AND :end").
                         addParam("begin", begin).addParam("end", end);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -38,7 +38,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.nuiton.topia.TopiaContext;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -152,7 +152,7 @@
         Assert.assertTrue(result);
 
         contact1.setContactState(ContactState.BOARDING_DONE);
-        contact1.setTideBeginDate(DateUtils.createDate(3, 3, 2010));
+        contact1.setTideBeginDate(DateUtil.createDate(3, 3, 2010));
         serviceContact.saveContact(contact1, false);
 
         result = boat.canCreateContact(company);
@@ -236,21 +236,21 @@
         // First contact : OK
         Contact contact1 = serviceContact.getNewContact(user, row, boat);
         contact1.setContactState(ContactState.BOARDING_DONE);
-        Date begin = DateUtils.createDate(3, 5, 2010);
+        Date begin = DateUtil.createDate(3, 5, 2010);
         contact1.setTideBeginDate(begin);
         contact1.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact1, false);
 
         /** EXEC METHOD **/
 
-        Date fromDate = DateUtils.createDate(1, 5, 2010);
+        Date fromDate = DateUtil.createDate(1, 5, 2010);
         int result = boat.getNbBoarding(fromDate);
         Assert.assertEquals(1, result);
 
         Contact contact2 = serviceContact.getNewContact(user, row, boat);
         // Second contact with ValidationProgram = FALSE
         contact2.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 8, 2010);
+        begin = DateUtil.createDate(3, 8, 2010);
         contact2.setTideBeginDate(begin);
         contact2.setValidationCompany(Boolean.TRUE);
         contact2.setValidationProgram(Boolean.FALSE);
@@ -262,7 +262,7 @@
         Contact contact3 = serviceContact.getNewContact(user, row, boat);
         // Third contact with tideBeginDate < fromDate
         contact3.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact3.setTideBeginDate(begin);
         contact3.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact3, false);
@@ -273,7 +273,7 @@
         Contact contact4 = serviceContact.getNewContact(user2, row2, boat);
         // Fourth contact : OK with an other company
         contact4.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 5, 2010);
+        begin = DateUtil.createDate(3, 5, 2010);
         contact4.setTideBeginDate(begin);
         contact4.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact4, false);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -118,8 +118,8 @@
 //        SampleRow row = prepareData();
 //
 //        Contact contact = new ContactImpl();
-//        Date beginDate = DateUtils.createDate(12, 4, 2009);
-//        Date endDate = DateUtils.createDate(15, 4, 2009);
+//        Date beginDate = DateUtil.createDate(12, 4, 2009);
+//        Date endDate = DateUtil.createDate(15, 4, 2009);
 //        contact.setTideBeginDate(beginDate);
 //        contact.setTideEndDate(endDate);
 //
@@ -131,7 +131,7 @@
 ////        // Reinit result for next test
 ////        result.addRealTideTime(-1);
 ////        // Test with a more than one day interval dates from contact
-////        endDate = DateUtils.createDate(18, 4, 2009);
+////        endDate = DateUtil.createDate(18, 4, 2009);
 ////        contact.setTideEndDate(endDate);
 ////
 ////        getRowFromContext().addRealTideTime(contact);
@@ -147,8 +147,8 @@
 //        SampleRow row = prepareData();
 //
 //        Contact contact = new ContactImpl();
-//        Date beginDate = DateUtils.createDate(12, 4, 2009);
-//        Date endDate = DateUtils.createDate(12, 4, 2009);
+//        Date beginDate = DateUtil.createDate(12, 4, 2009);
+//        Date endDate = DateUtil.createDate(12, 4, 2009);
 //        contact.setTideBeginDate(beginDate);
 //        contact.setTideEndDate(endDate);
 //
@@ -162,7 +162,7 @@
 //        result.addRealTideTime(12);
 //
 //        // Test with a more than one day interval dates from contact : only one tide to remove
-//        endDate = DateUtils.createDate(18, 4, 2009);
+//        endDate = DateUtil.createDate(18, 4, 2009);
 //        contact.setTideEndDate(endDate);
 //
 //        getRowFromContext().removeRealTideTime(contact);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -55,7 +55,7 @@
 import org.junit.Test;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -128,8 +128,8 @@
         row.setNbObservants(3);
         row.setAverageTideTime(2.5);
         row.setProgramName("DPMA-2009");
-        row.setPeriodBegin(DateUtils.createDate(1, 1, 2009));
-        row.setPeriodEnd(DateUtils.createDate(31, 3, 2010));
+        row.setPeriodBegin(DateUtil.createDate(1, 1, 2009));
+        row.setPeriodEnd(DateUtil.createDate(31, 3, 2010));
         row.setProfession(profession1);
         row.setSampleMonth(months);
         row.setFishingZone(zones);
@@ -236,13 +236,13 @@
         List<FishingZone> zones = prepareFishingZones(transaction);
 
         //Program program1 = programDAO.create(Program.NAME, "DPMA-2009");
-        Date dateBegin1 = DateUtils.createDate(1, 1, 2009);
-        Date dateEnd1 = DateUtils.createDate(1, 3, 2010);
+        Date dateBegin1 = DateUtil.createDate(1, 1, 2009);
+        Date dateEnd1 = DateUtil.createDate(1, 3, 2010);
         PeriodDates period1 = new PeriodDates(dateBegin1, dateEnd1);
 
         //Program program2 = programDAO.create(Program.NAME, "PPDA-2008");
-        Date dateBegin2 = DateUtils.createDate(1, 1, 2008);
-        Date dateEnd2 = DateUtils.createDate(1, 12, 2008);
+        Date dateBegin2 = DateUtil.createDate(1, 1, 2008);
+        Date dateEnd2 = DateUtil.createDate(1, 12, 2008);
         PeriodDates period2 = new PeriodDates(dateBegin2, dateEnd2);
 
         SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction);

Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -43,7 +43,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.nuiton.topia.TopiaContext;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -155,7 +155,7 @@
         contact1.setObserver(user);
         contact1.setSampleRow(row);
         contact1.setContactState(ContactState.BOARDING_DONE);
-        Date begin = DateUtils.createDate(3, 3, 2010);
+        Date begin = DateUtil.createDate(3, 3, 2010);
         contact1.setTideBeginDate(begin);
         contact1.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact1, false);
@@ -165,7 +165,7 @@
         contact2.setObserver(user);
         contact2.setSampleRow(row);
         contact2.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact2.setTideBeginDate(begin);
         contact2.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact2, false);
@@ -175,7 +175,7 @@
         contact3.setObserver(user);
         contact3.setSampleRow(row);
         contact3.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact3.setTideBeginDate(begin);
         contact3.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact3, false);
@@ -246,7 +246,7 @@
         // 1 real observer over 1
         contact1.setNbObservants(1);
         contact1.setContactState(ContactState.BOARDING_DONE);
-        Date begin = DateUtils.createDate(3, 3, 2010);
+        Date begin = DateUtil.createDate(3, 3, 2010);
         contact1.setTideBeginDate(begin);
         contact1.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact1, false);
@@ -258,7 +258,7 @@
         // 2 real observer over 1
         contact2.setNbObservants(2);
         contact2.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact2.setTideBeginDate(begin);
         contact2.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact2, false);
@@ -270,7 +270,7 @@
         // 1 real observer over 2
         contact3.setNbObservants(1);
         contact3.setContactState(ContactState.BOARDING_DONE);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact3.setTideBeginDate(begin);
         contact3.setValidationCompany(Boolean.TRUE);
         serviceContact.saveContact(contact3, false);
@@ -352,7 +352,7 @@
 //        contact1.setObserver(user);
 //        contact1.setSampleRow(row);
 //        contact1.setContactState(ContactState.BOARDING_DONE);
-//        Date begin = DateUtils.createDate(3, 3, 2010);
+//        Date begin = DateUtil.createDate(3, 3, 2010);
 //        contact1.setTideBeginDate(begin);
 //        serviceContact.saveContact(contact1, false);
 //
@@ -361,7 +361,7 @@
 //        contact2.setObserver(user);
 //        contact2.setSampleRow(row);
 //        contact2.setContactState(ContactState.BOARDING_DONE);
-//        begin = DateUtils.createDate(3, 10, 2010);
+//        begin = DateUtil.createDate(3, 10, 2010);
 //        contact2.setTideBeginDate(begin);
 //        serviceContact.saveContact(contact2, false);
 //
@@ -370,7 +370,7 @@
 //        contact3.setObserver(user);
 //        contact3.setSampleRow(row);
 //        contact3.setContactState(ContactState.BOAT_REFUSED);
-//        begin = DateUtils.createDate(3, 5, 2010);
+//        begin = DateUtil.createDate(3, 5, 2010);
 //        contact3.setTopiaCreateDate(begin);
 //        serviceContact.saveContact(contact3, false);
 //
@@ -380,7 +380,7 @@
 //        contact4.setObserver(user2);
 //        contact4.setSampleRow(row2);
 //        contact4.setContactState(ContactState.BOARDING_EXPECTED);
-//        begin = DateUtils.createDate(3, 3, 2010);
+//        begin = DateUtil.createDate(3, 3, 2010);
 //        contact4.setTopiaCreateDate(begin);
 //        serviceContact.saveContact(contact4, false);
 //
@@ -389,7 +389,7 @@
 //        contact5.setObserver(user2);
 //        contact5.setSampleRow(row2);
 //        contact5.setContactState(ContactState.BOAT_UNAVAILABLE);
-//        begin = DateUtils.createDate(3, 5, 2010);
+//        begin = DateUtil.createDate(3, 5, 2010);
 //        contact5.setTopiaCreateDate(begin);
 //        serviceContact.saveContact(contact5, false);
 //
@@ -399,7 +399,7 @@
 //        contact6.setObserver(user2);
 //        contact6.setSampleRow(row2);
 //        contact6.setContactState(ContactState.BOAT_UNAVAILABLE);
-//        begin = DateUtils.createDate(3, 3, 2010);
+//        begin = DateUtil.createDate(3, 3, 2010);
 //        contact6.setTopiaCreateDate(begin);
 //        contact6.setValidationProgram(Boolean.FALSE);
 //        serviceContact.saveContact(contact6, false);
@@ -445,8 +445,8 @@
         assertEquals(1, data.get(ContactState.BOAT_UNAVAILABLE).intValue());
 
         // result for period 3/1/2010 to 31/3/2010 for BIS company
-        Date begin = DateUtils.createDate(3, 1, 2010);
-        Date end = DateUtils.createDate(31, 3, 2010);
+        Date begin = DateUtil.createDate(3, 1, 2010);
+        Date end = DateUtil.createDate(31, 3, 2010);
         PeriodDates period = new PeriodDates(begin, end);
 
         results = service.getContactStateStatistics(company2, period);
@@ -513,9 +513,9 @@
         contact1.setBoat(boat);
         contact1.setObserver(user);
         contact1.setSampleRow(row);
-        Date begin = DateUtils.createDate(3, 3, 2010);
+        Date begin = DateUtil.createDate(3, 3, 2010);
         contact1.setTideBeginDate(begin);
-        Date inputDate = DateUtils.createDate(15, 4, 2010);
+        Date inputDate = DateUtil.createDate(15, 4, 2010);
         contact1.setDataInputDate(inputDate);
         contact1.setContactState(ContactState.BOARDING_DONE);
         contact1.setValidationCompany(Boolean.TRUE);
@@ -525,9 +525,9 @@
         contact2.setBoat(boat);
         contact2.setObserver(user);
         contact2.setSampleRow(row);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact2.setTideBeginDate(begin);
-        inputDate = DateUtils.createDate(15, 3, 2010);
+        inputDate = DateUtil.createDate(15, 3, 2010);
         contact2.setDataInputDate(inputDate);
         contact2.setContactState(ContactState.BOARDING_DONE);
         contact2.setValidationCompany(Boolean.TRUE);
@@ -537,7 +537,7 @@
         contact3.setBoat(boat2);
         contact3.setObserver(user2);
         contact3.setSampleRow(row2);
-        begin = DateUtils.createDate(3, 3, 2010);
+        begin = DateUtil.createDate(3, 3, 2010);
         contact3.setTideBeginDate(begin);
         contact3.setDataInputDate(begin);
         contact3.setContactState(ContactState.BOARDING_DONE);

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -27,7 +27,7 @@
 import fr.ifremer.wao.WaoUtils;
 import org.apache.tapestry5.StreamResponse;
 import org.apache.tapestry5.services.Response;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 
 import java.util.Date;
 
@@ -69,7 +69,7 @@
     @Override
     public void prepareResponse(Response response) {
         Date current = WaoUtils.getCurrentDate();
-        filename += "-" + DateUtils.formatDate(current, "dd-MM-yyyy") + ".csv";
+        filename += "-" + DateUtil.formatDate(current, "dd-MM-yyyy") + ".csv";
         response.setHeader("Content-Disposition",
                 "attachment; filename=\"" + filename +"\"");
     }

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -41,7 +41,7 @@
 import org.apache.tapestry5.annotations.Property;
 import org.apache.tapestry5.annotations.SessionState;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.slf4j.Logger;
 
 import java.util.Collections;
@@ -138,7 +138,7 @@
     }
 
     public String getMonthName() {
-        String libelle = DateUtils.getMonthLibelle(month);
+        String libelle = DateUtil.getMonthLibelle(month);
         return StringUtils.capitalize(libelle);
     }
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -71,7 +71,7 @@
 import org.apache.tapestry5.json.JSONObject;
 import org.apache.tapestry5.services.BeanModelSource;
 import org.apache.tapestry5.upload.services.UploadedFile;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -161,7 +161,7 @@
             }
             contactFilter = new ContactFilterImpl();
             // Initialized to 12 months before the current day
-            Date fromDate = DateUtils.createDateAfterToday(0, -3, 0);
+            Date fromDate = DateUtil.createDateAfterToday(0, -3, 0);
             contactFilter.setFromDate(fromDate);
         }
         return contactFilter;

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-10-03 15:14:48 UTC (rev 650)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-10-03 15:20:28 UTC (rev 651)
@@ -53,7 +53,7 @@
 import org.apache.tapestry5.corelib.components.Zone;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.jfree.chart.JFreeChart;
-import org.nuiton.util.DateUtils;
+import org.nuiton.util.DateUtil;
 import org.nuiton.util.PeriodDates;
 import org.slf4j.Logger;
 
@@ -292,7 +292,7 @@
     }
 
     public Date getFromDate() {
-        return DateUtils.createDateAfterToday(0, -12, 0);
+        return DateUtil.createDateAfterToday(0, -12, 0);
     }
 
     @Log

    

fdesbois＠users.labs.libre-entreprise.org