aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorPatrik Lindström <patrik@vaadin.com>2013-07-29 15:09:35 +0300
committerVaadin Code Review <review@vaadin.com>2013-07-30 11:33:18 +0000
commit7cb49d10de85b038b3f7068bf87b6c10315d3c21 (patch)
tree9e56c438da2c55076726418c812d8a10422d8ada /server
parent3a373efe27780f3ffd1f0e01fb6dabdb65af590c (diff)
downloadvaadin-framework-7cb49d10de85b038b3f7068bf87b6c10315d3c21.tar.gz
vaadin-framework-7cb49d10de85b038b3f7068bf87b6c10315d3c21.zip
Fix invisible calendar actions menu #12181
Change-Id: I4cdf3d1e584f1537f0f216ddd6f65c1ec4a2ee6b
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/ui/Calendar.java1
-rw-r--r--server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java11
2 files changed, 12 insertions, 0 deletions
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 + "]";
+ }
+
}