From 044e2f6fc59fdaf3df3f4f54361d19c634fafecf Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Sat, 14 Jun 2008 18:31:49 +0000 Subject: [PATCH] Fixes #1819 : Selection with null-not allowed, but with null selected does not immediately remove null selection possibility when selected svn changeset:4885/svn branch:trunk --- src/com/itmill/toolkit/ui/Select.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java index 5b33aadd5c..3c769912ba 100644 --- a/src/com/itmill/toolkit/ui/Select.java +++ b/src/com/itmill/toolkit/ui/Select.java @@ -169,8 +169,14 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { while (i.hasNext()) { - // Gets the option attribute values final Object id = i.next(); + + if (!isNullSelectionAllowed() && id != null + && id.equals(getNullSelectionItemId()) && !isSelected(id)) { + continue; + } + + // Gets the option attribute values final String key = itemIdMapper.key(id); final String caption = getItemCaption(id); final Resource icon = getItemIcon(id); -- 2.39.5