From 8c226ab0f258f7b294701612b51a1c8f96471f83 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 22 Aug 2012 11:17:12 +0000
Subject: Fixed SQLContainer and ComboBox co-operation problems (#9155)

svn changeset:24220/svn branch:6.8
---
 src/com/vaadin/data/util/sqlcontainer/SQLContainer.java |  4 +---
 src/com/vaadin/ui/Select.java                           | 14 +-------------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 71b260fa21..c9bd52f926 100644
--- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -515,9 +515,7 @@ public class SQLContainer implements Container, Container.Filterable,
      */
     public void removeContainerFilter(Filter filter) {
         filters.remove(filter);
-        // TODO this cannot be added before ComboBox is fixed
-        // (Select.requestRepaint() must not affect filter string)
-        // refresh();
+        refresh();
     }
 
     /**
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index 0ea331dc40..8f2c5175a2 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -656,7 +656,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
             if (filterstring != null) {
                 filterstring = filterstring.toLowerCase();
             }
-            optionRepaint();
+            requestRepaint();
         } else if (isNewItemsAllowed()) {
             // New option entered (and it is allowed)
             final String newitem = (String) variables.get("newitem");
@@ -677,18 +677,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
 
     }
 
-    @Override
-    public void requestRepaint() {
-        super.requestRepaint();
-        optionRequest = false;
-        prevfilterstring = filterstring;
-        filterstring = null;
-    }
-
-    private void optionRepaint() {
-        super.requestRepaint();
-    }
-
     public void setFilteringMode(int filteringMode) {
         this.filteringMode = filteringMode;
     }
-- 
cgit v1.2.3