From 104a5d8ad17c8fbd524dc7d91908c5ebb2f114ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 18 Jan 2010 13:56:47 +0100 Subject: [PATCH] ItEr43S10SoporteImpresionMultiplesPaxinasItEr42S15: Converting to at least minimum before rounding --- .../zoom/TimeTrackerStateUsingJodaTime.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java index 7892aba5c..a7839d144 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java @@ -92,14 +92,17 @@ public abstract class TimeTrackerStateUsingJodaTime extends TimeTrackerState { @Override public Interval getRealIntervalFor(Interval testInterval) { - LocalDate start = round(asLocalDate(testInterval.getStart()), true); - LocalDate finish = roundToNextYear(asLocalDate(testInterval.getFinish())); + return calculateForAtLeastMinimum(calculateIntervalWithMinimum(testInterval)); + } - Interval candidateInterval = new Interval(start.toDateTimeAtStartOfDay().toDate(), finish + private Interval calculateForAtLeastMinimum(Interval atLeastMinimum) { + LocalDate start = round(asLocalDate(atLeastMinimum.getStart()), true); + LocalDate finish = roundToNextYear(asLocalDate(atLeastMinimum + .getFinish())); + Interval result = new Interval(start.toDateTimeAtStartOfDay().toDate(), + finish .toDateTimeAtStartOfDay().toDate()); - - Interval resultInterval = calculateIntervalWithMinimum(candidateInterval); - return resultInterval; + return result; } protected LocalDate roundToNextYear(LocalDate date) {