From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sat, 14 Jun 2008 18:31:49 +0000 (+0000)
Subject: Fixes #1819 : Selection with null-not allowed, but with null selected does not immedi... 
X-Git-Tag: 6.7.0.beta1~4591
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=044e2f6fc59fdaf3df3f4f54361d19c634fafecf;p=vaadin-framework.git

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
---

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);