From: Jonatan Kronqvist Date: Fri, 28 Jan 2011 11:21:24 +0000 (+0000) Subject: #6344 fixed, including test case X-Git-Tag: 6.7.0.beta1~454^2~21 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=78844bf305b5da4d96e9d4e1ddeeb9fcdea0a8ea;p=vaadin-framework.git #6344 fixed, including test case svn changeset:17056/svn branch:6.5 --- diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java index a14e52d1e6..c8da86f206 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java @@ -114,7 +114,7 @@ public class VDateFieldCalendar extends VDateField { Date date2 = calendarPanel.getDate(); Date currentDate = getCurrentDate(); if (currentDate == null || date2.getTime() != currentDate.getTime()) { - setCurrentDate(date2); + setCurrentDate((Date) date2.clone()); getClient().updateVariable(getId(), "year", date2.getYear() + 1900, false); if (getCurrentResolution() > VDateField.RESOLUTION_YEAR) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 31e1824706..623bd1bf1b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -103,7 +103,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, private void updateValue(Date newDate) { Date currentDate = getCurrentDate(); if (currentDate == null || newDate.getTime() != currentDate.getTime()) { - setCurrentDate(newDate); + setCurrentDate((Date) newDate.clone()); getClient().updateVariable(getId(), "year", newDate.getYear() + 1900, false); if (getCurrentResolution() > VDateField.RESOLUTION_YEAR) { @@ -164,7 +164,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, if (calendar.getResolution() != currentResolution) { calendar.setResolution(currentResolution); if (calendar.getDate() != null) { - calendar.setDate(getCurrentDate()); + calendar.setDate((Date) getCurrentDate().clone()); // force re-render when changing resolution only calendar.renderCalendar(); } diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html new file mode 100644 index 0000000000..d82d4e02b5 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html @@ -0,0 +1,137 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
InlineDateFieldSecondValueChange
open/run/com.vaadin.tests.components.datefield.InlineDateFieldTest?restartApplication
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item08,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item430,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item072,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item223,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item042,7
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item446,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item458,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item296,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item029,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item343,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item268,2
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[3]/domChild[0]15,11
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_0325,15
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_03. ValueChangeEvent, new value: Dec 14, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[2]/domChild[0]20,6
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_04. ValueChangeEvent, new value: Dec 13, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]11,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[2]/domChild[0]18,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_0145,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_05. ValueChangeEvent, new value: Dec 14, 2009 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]11,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[3]/domChild[0]20,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_06. ValueChangeEvent, new value: Jan 12, 2010 12:00:00.000
+ +