From 78b7745fb32144cbbbd803416375cf0526507252 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Mon, 10 Dec 2007 10:34:03 +0000
Subject: [PATCH] Selects newitem. nullitem "-" -> ""

svn changeset:3201/svn branch:trunk
---
 src/com/itmill/toolkit/ui/Select.java | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 9658940c34..4d0e85bd76 100644
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -141,27 +141,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
         // by terminal
         int keyIndex = 0;
 
-        /*
-         * if (!isLazyLoading()) { // Support for external null selection item
-         * id Collection ids = getItemIds(); if (getNullSelectionItemId() !=
-         * null && (!ids.contains(getNullSelectionItemId()))) { // Gets the
-         * option attribute values Object id = getNullSelectionItemId(); String
-         * key = this.itemIdMapper.key(id); String caption = getItemCaption(id);
-         * Resource icon = getItemIcon(id); // Paints option
-         * target.startTag("so"); if (icon != null) {
-         * target.addAttribute("icon", icon); } target.addAttribute("caption",
-         * caption); target.addAttribute("nullselection", true);
-         * target.addAttribute("key", key); if (isSelected(id)) {
-         * target.addAttribute("selected", true); selectedKeys[keyIndex++] =
-         * key; } target.endTag("so"); } }
-         */
-        /*
-         * Iterator i; if (this.filterstring != null) { i =
-         * this.optionFilter.filter(this.filterstring,
-         * this.lazyLoadingPageLength, this.page).iterator();
-         * target.addAttribute("totalMatches", this.optionFilter
-         * .getMatchCount()); } else { i = getItemIds().iterator(); }
-         */
         target.startTag("options");
 
         final boolean paintNullSelection = needNullSelectOption
@@ -170,7 +149,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
 
         if (paintNullSelection) {
             target.startTag("so");
-            target.addAttribute("caption", "-");
+            target.addAttribute("caption", "");
             target.addAttribute("key", "");
             target.endTag("so");
         }
@@ -329,6 +308,9 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
                     }
                 }
                 setValue(newitem);
+                // rebuild list
+                filterstring = newitem;
+                prevfilterstring = null;
             }
         }
 
-- 
2.39.5