RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use LocalDate instead of Date in LoadTimeLine.getIntervalFrom.

Browse source 
Changes the code introduced in commit:
1d0734a1ab

FEA: ItEr75S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2011-10-14 11:09:43 +02:00
parent e03838776c
commit 41ca9de2b3
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
View file

@ -22,14 +22,13 @@
package org.zkoss.ganttz.data.resourceload;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import org.apache.commons.collections.ComparatorUtils;
import org.apache.commons.lang.Validate;
import org.joda.time.LocalDate;
import org.zkoss.ganttz.data.GanttDate;
import org.zkoss.ganttz.util.Interval;
@ -155,18 +154,12 @@ public class LoadTimeLine {
}
}
if (timeLines.isEmpty() || start == null || end == null) {
return new Interval(new Date(), plusFiveYears(new Date()));
LocalDate localDateNow = new LocalDate();
return new Interval(localDateNow, localDateNow.plusYears(5));
}
return new Interval(start.toLocalDate(), end.asExclusiveEnd());
}
private static Date plusFiveYears(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.YEAR, 5);
return calendar.getTime();
}
private static GanttDate max(GanttDate one, GanttDate other) {
if (one == null) {
return other;