Move ComboBox filtering mode to state (#19929)

Change-Id: I7eaf2dae59133745d6a7c686503625f1f5216c52

1 files changed, 2 insertions, 11 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 189f6b469d..01a8db571c 100644
--- a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -34,10 +34,8 @@ import com.vaadin.client.ui.VFilterSelect.FilterSelectSuggestion;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.combobox.ComboBoxConstants;
 import com.vaadin.shared.ui.combobox.ComboBoxServerRpc;
 import com.vaadin.shared.ui.combobox.ComboBoxState;
-import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 
 @Connect(ComboBox.class)
@@ -83,6 +81,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
 
         getWidget().pageLength = getState().pageLength;
 
+        getWidget().filteringmode = getState().filteringMode;
+
         Profiler.leave("ComboBoxConnector.onStateChanged update content");
     }
 
@@ -101,11 +101,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
         // not a FocusWidget -> needs own tabindex handling
         getWidget().tb.setTabIndex(getState().tabIndex);
 
-        if (uidl.hasAttribute("filteringmode")) {
-            getWidget().filteringmode = FilteringMode.valueOf(uidl
-                    .getStringAttribute("filteringmode"));
-        }
-
         getWidget().nullSelectionAllowed = uidl.hasAttribute("nullselect");
 
         getWidget().nullSelectItem = uidl.hasAttribute("nullselectitem")
@@ -113,10 +108,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
 
         getWidget().currentPage = uidl.getIntVariable("page");
 
-        if (uidl.hasAttribute("pagelength")) {
-            getWidget().pageLength = uidl.getIntAttribute("pagelength");
-        }
-
         if (uidl.hasAttribute("suggestionPopupWidth")) {
             getWidget().suggestionPopupWidth = uidl
                     .getStringAttribute("suggestionPopupWidth");