From 41ca9de2b36d1ae6883733ceb19cf0c83b14aea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 14 Oct 2011 11:09:43 +0200
Subject: [PATCH] Use LocalDate instead of Date in
 LoadTimeLine.getIntervalFrom.

Changes the code introduced in commit:
1d0734a1ab57aaa0c7ad319bf0027dc09e74349b

FEA: ItEr75S04BugFixing
---
 .../ganttz/data/resourceload/LoadTimeLine.java      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
index c054efeba..e672b80f1 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
@@ -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;