From 7cb49d10de85b038b3f7068bf87b6c10315d3c21 Mon Sep 17 00:00:00 2001 From: Patrik Lindström Date: Mon, 29 Jul 2013 15:09:35 +0300 Subject: Fix invisible calendar actions menu #12181 Change-Id: I4cdf3d1e584f1537f0f216ddd6f65c1ec4a2ee6b --- server/src/com/vaadin/ui/Calendar.java | 1 + .../com/vaadin/ui/components/calendar/CalendarDateRange.java | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'server') diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/com/vaadin/ui/Calendar.java index c3385baa2c..8b8cc7b475 100644 --- a/server/src/com/vaadin/ui/Calendar.java +++ b/server/src/com/vaadin/ui/Calendar.java @@ -535,6 +535,7 @@ public class Calendar extends AbstractComponent implements // Get day start and end times Date start = cal.getTime(); cal.add(java.util.Calendar.DATE, 1); + cal.add(java.util.Calendar.SECOND, -1); Date end = cal.getTime(); boolean monthView = (durationInDays > 7); diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java b/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java index 01b766a6db..b78fda3136 100644 --- a/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java +++ b/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java @@ -83,4 +83,15 @@ public class CalendarDateRange implements Serializable { return date.compareTo(start) >= 0 && date.compareTo(end) <= 0; } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "CalendarDateRange [start=" + start + ", end=" + end + "]"; + } + } -- cgit v1.2.3