=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-06-23 15:07:29 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-06-27 08:17:57 +0000 @@ -45,6 +45,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.calendar.Calendar; +import org.hisp.dhis.calendar.DateUnit; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.hisp.dhis.dataelement.CategoryOptionGroup; import org.hisp.dhis.dataelement.CategoryOptionGroupSet; @@ -440,8 +441,8 @@ List batchArgs = new ArrayList(); - Date startDate = new Cal( 1975, 1, 1 ).time(); //TODO - Date endDate = new Cal( 2030, 1 , 1 ).time(); + Date startDate = new DateUnit( 1975, 1, 1, true ).toJdkDate(); //TODO + Date endDate = new DateUnit( 2030, 1 , 1, true ).toJdkDate(); List days = new DailyPeriodType().generatePeriods( startDate, endDate );