Merge remote-tracking branch 'origin/6.8'

Conflicts:
	server/src/com/vaadin/ui/Select.java

3 files changed, 6 insertions, 16 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();
     }
 
     /**
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index 8546d8f830..68b9f1392f 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -472,6 +472,10 @@ public class Button extends AbstractComponent implements
      * Determines if a button is automatically disabled when clicked. If this is
      * set to true the button will be automatically disabled when clicked,
      * typically to prevent (accidental) extra clicks on a button.
+     * <p>
+     * Note that this is only used when the click comes from the user, not when
+     * calling {@link #click()}.
+     * </p>
      * 
      * @param disableOnClick
      *            true to disable button when it is clicked, false otherwise
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index 20345b55e0..6ff7c9c9bc 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -654,7 +654,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");
@@ -682,18 +682,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
     }
 
     @Override
-    public void markAsDirty() {
-        super.markAsDirty();
-        optionRequest = false;
-        prevfilterstring = filterstring;
-        filterstring = null;
-    }
-
-    private void optionRepaint() {
-        super.markAsDirty();
-    }
-
-    @Override
     public void setFilteringMode(int filteringMode) {
         this.filteringMode = filteringMode;
     }