Changeset 5249

Timestamp:

08/25/08 05:50:59 (3 months ago)

Author:

artur.signell@…

Message:

Fixes #1230 - NPE in AbstractSelect?.select and allow selecting null -> NullSelectionItem?

Location:

trunk/src/com/itmill/toolkit

Files:

• tests/tickets/Ticket1230.java (modified) (3 diffs)
• ui/AbstractSelect.java (modified) (2 diffs)

trunk/src/com/itmill/toolkit/tests/tickets/Ticket1230.java

@@ -21 +21 @@
         setMainWindow(w);
 
-        GridLayout layout = new GridLayout(3, 5);
+        GridLayout layout = new GridLayout(5, 5);
         w.setLayout(layout);
 
@@ -34 +34 @@
                 public void buttonClick(ClickEvent event) {
                     selectWithoutNullItem.select(NULL_ITEM_ID);
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 1", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select("1");
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 2", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select("2");
 
                 }
@@ -60 +76 @@
                 public void buttonClick(ClickEvent event) {
                     selectWithNullItem.select(NULL_ITEM_ID);
+
+                }
+            });
+            layout.addComponent(b);
+
+            b = new Button("Select 1", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select("1");
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 2", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select("2");
 
                 }

trunk/src/com/itmill/toolkit/ui/AbstractSelect.java

@@ -591 +591 @@
     public void setValue(Object newValue) throws Property.ReadOnlyException,
             Property.ConversionException {
+        if (newValue == null) {
+            newValue = getNullSelectionItemId();
+        }
+
         setValue(newValue, false);
     }
@@ -1319 +1323 @@
      */
     public void select(Object itemId) {
-        if (!isSelected(itemId) && items.containsId(itemId)) {
-            if (isMultiSelect()) {
-                final Set s = new HashSet((Set) getValue());
-                s.add(itemId);
-                setValue(s);
-            } else if (itemId.equals(getNullSelectionItemId())) {
-                setValue(null);
-            } else {
-                setValue(itemId);
-            }
+        if (!isMultiSelect()) {
+            setValue(itemId);
+        } else if (!isSelected(itemId) && itemId != null
+                && items.containsId(itemId)) {
+            final Set s = new HashSet((Set) getValue());
+            s.add(itemId);
+            setValue(s);
         }
     }