From 8870be019cab9a138c4f37f8b208545efdf551ef Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Fri, 17 Sep 2010 16:52:28 +0000 Subject: [PATCH] fixed logic problem causing regression since [14965] (related to #5592) svn changeset:15008/svn branch:6.4 --- .../vaadin/terminal/gwt/client/ui/VCalendarPanel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index 4b47d18b65..ff754d2cf9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -1208,7 +1208,7 @@ public class VCalendarPanel extends FocusableFlexTable implements return; } - Date oldValue = value; + Date oldFocusedValue = focusedDate; value = currentDate; if (value == null) { @@ -1217,10 +1217,10 @@ public class VCalendarPanel extends FocusableFlexTable implements focusedDate = (Date) value.clone(); } - // Re-render calendar if month or year has changed - if (oldValue == null || value == null - || oldValue.getYear() != value.getYear() - || oldValue.getMonth() != value.getMonth()) { + // Re-render calendar if month or year of focused date has changed + if (oldFocusedValue == null || value == null + || oldFocusedValue.getYear() != value.getYear() + || oldFocusedValue.getMonth() != value.getMonth()) { renderCalendar(); } else { focusDay(currentDate.getDate()); -- 2.39.5