summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/data/util/sqlcontainer
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-27 13:38:13 +0300
committerArtur Signell <artur@vaadin.com>2012-08-27 13:38:13 +0300
commit5964acd1e7ea2a00681fc49525f4f10e5dfa06fe (patch)
treedc0c01c12664e567c75d9165eb80457a8a7e5c85 /server/src/com/vaadin/data/util/sqlcontainer
parent2af52b6102051fd9289778c35a1a74c58d51bf02 (diff)
parent9a32e217f2cb89887b2a46934b992ff32e880ba1 (diff)
downloadvaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.tar.gz
vaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.zip
Merge remote-tracking branch 'origin/6.8'
Conflicts: server/src/com/vaadin/ui/Select.java
Diffstat (limited to 'server/src/com/vaadin/data/util/sqlcontainer')
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index f772e2701c..13248f1e06 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -551,9 +551,7 @@ public class SQLContainer implements Container, Container.Filterable,
@Override
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();
}
/**