Fix for #1718 (?)

svn changeset:4634/svn branch:trunk

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 72ba57066421e69f752e028115f3fac92f5adade..696f41c353e2558de906fc56edeebb289053beca 100644 (file)
--- 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();\r
                 hours = (d.getDate() > date.getDate() ? 24 : d.getHours())\r
                         - start;\r
-                if (hours == 0) {\r
+                if (hours < 1) {\r
                     // We can't draw entries smaller than\r
                     // one\r
                     hours = 1;\r
@@ -245,8 +245,8 @@ public class ICalendarField extends IDateField {
             // TODO should remove+readd if the same entry (id) is\r
             // added again\r
 \r
-            for (final Date d = entry.getStart(); d.getYear() <= entry.getEnd()\r
-                    .getYear()\r
+            for (final Date d = new Date(entry.getStart().getTime()); d\r
+                    .getYear() <= entry.getEnd().getYear()\r
                     && d.getMonth() <= entry.getEnd().getYear()\r
                     && d.getDate() <= entry.getEnd().getDate(); d.setTime(d\r
                     .getTime() + 86400000)) {\r