From 0230adada02cf432af6277342d2bca015efbe599 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 7 Feb 2011 13:53:51 +0000 Subject: [PATCH] #6319 Delesecting one preselected item in multiselect ListSelect svn changeset:17188/svn branch:6.5 --- .../terminal/gwt/client/ui/VListSelect.java | 4 +- .../listselect/ListSelectSelection.html | 165 ++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java index e19079039d..46211bafe5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java @@ -51,7 +51,9 @@ public class VListSelect extends VOptionGroupBase { select.addItem(optionUidl.getStringAttribute("caption"), optionUidl.getStringAttribute("key")); if (optionUidl.hasAttribute("selected")) { - select.setItemSelected(select.getItemCount() - 1, true); + int itemIndex = select.getItemCount() - 1; + select.setItemSelected(itemIndex, true); + lastSelectedIndex = itemIndex; } } if (getRows() > 0) { diff --git a/tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html b/tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html new file mode 100644 index 0000000000..9820e044f7 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/listselect/ListSelectSelection.html @@ -0,0 +1,165 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + multi select mode--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.listselect.ListSelects?restartApplication
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::PID_Smenu#item031,10
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::Root/VOverlay[0]/VMenuBar[0]#item348,3
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::Root/VOverlay[1]/VMenuBar[0]#item054,6
selectvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 1
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_01. ValueChangeEvent, new value: 'Item 1'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]1
selectvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 5
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_02. ValueChangeEvent, new value: 'Item 5'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]5
selectvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 2
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_03. ValueChangeEvent, new value: 'Item 2'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]2
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::PID_Smenu#item046,4
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::Root/VOverlay[0]/VMenuBar[0]#item454,12
mouseClickvaadin=runcomvaadintestscomponentslistselectListSelects::Root/VOverlay[1]/VMenuBar[0]#item122,2
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_05. ValueChangeEvent, new value: '[Item 2]'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]2
addSelectionvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 1
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_06. ValueChangeEvent, new value: '[Item 1, Item 2]'
removeSelectionvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 1
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_07. ValueChangeEvent, new value: '[Item 2]'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]2
removeSelectionvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 2
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_07. ValueChangeEvent, new value: '[Item 2]'
open/run/com.vaadin.tests.components.listselect.ListSelects
removeSelectionvaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]label=Item 2
assertTextvaadin=runcomvaadintestscomponentslistselectListSelects::PID_SLog_row_07. ValueChangeEvent, new value: '[Item 2]'
assertValuevaadin=runcomvaadintestscomponentslistselectListSelects::PID_StestComponent/domChild[0]2
+ + -- 2.39.5