From 824fa12b14b25d7c2d5f425911a7ff86afadd544 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Mon, 26 May 2008 13:40:41 +0000 Subject: [PATCH] Fix for #1718 (?) svn changeset:4634/svn branch:trunk --- .../demo/reservation/gwt/client/ui/ICalendarField.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java index 72ba570664..696f41c353 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java @@ -133,7 +133,7 @@ public class ICalendarField extends IDateField { d = entry.getEnd(); hours = (d.getDate() > date.getDate() ? 24 : d.getHours()) - start; - if (hours == 0) { + if (hours < 1) { // We can't draw entries smaller than // one hours = 1; @@ -245,8 +245,8 @@ public class ICalendarField extends IDateField { // TODO should remove+readd if the same entry (id) is // added again - for (final Date d = entry.getStart(); d.getYear() <= entry.getEnd() - .getYear() + for (final Date d = new Date(entry.getStart().getTime()); d + .getYear() <= entry.getEnd().getYear() && d.getMonth() <= entry.getEnd().getYear() && d.getDate() <= entry.getEnd().getDate(); d.setTime(d .getTime() + 86400000)) { -- 2.39.5