From 029f3e59ef23625ef5171705e3fe1d54c7a531c7 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 12 Nov 2015 12:46:11 +0200 Subject: Minor ComboBox client side cleanup (#19929) Remove unused references to immediate flags. Change-Id: I780fcf44f9824a132acb35d37d40d8c969d4f0f3 --- client/src/com/vaadin/client/ui/VFilterSelect.java | 25 ++-------------------- .../client/ui/combobox/ComboBoxConnector.java | 4 ---- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java index 0ef3dd07c1..5089793393 100644 --- a/client/src/com/vaadin/client/ui/VFilterSelect.java +++ b/client/src/com/vaadin/client/ui/VFilterSelect.java @@ -77,7 +77,6 @@ import com.vaadin.client.ui.combobox.ComboBoxConnector; import com.vaadin.client.ui.menubar.MenuBar; import com.vaadin.client.ui.menubar.MenuItem; import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.EventId; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.util.SharedUtil; @@ -1633,22 +1632,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * The filter to apply to the components */ public void filterOptions(int page, String filter) { - filterOptions(page, filter, true); - } - - /** - * Filters the options at certain page using the given filter - * - * @param page - * The page to filter - * @param filter - * The filter to apply to the options - * @param immediate - * Whether to send the options request immediately - */ - private void filterOptions(int page, String filter, boolean immediate) { - debug("VFS: filterOptions(" + page + ", " + filter + ", " + immediate - + ")"); + debug("VFS: filterOptions(" + page + ", " + filter + ")"); if (filter.equals(lastFilter) && currentPage == page) { if (!suggestionPopup.isAttached()) { @@ -2223,12 +2207,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // ask suggestionPopup if it was just closed, we are using GWT // Popup's auto close feature if (!suggestionPopup.isJustClosed()) { - // If a focus event is not going to be sent, send the options - // request immediately; otherwise queue in the same burst as the - // focus event. Fixes #8321. - boolean immediate = focused - || !connector.hasEventListener(EventId.FOCUS); - filterOptions(-1, "", immediate); + filterOptions(-1, ""); dataReceivedHandler.popupOpenerClicked(); lastFilter = ""; } diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java index 6f9860131d..b20fa851c7 100644 --- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -47,8 +47,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements protected FocusAndBlurServerRpc focusAndBlurRpc = RpcProxy.create( FocusAndBlurServerRpc.class, this); - private boolean immediate; - @Override protected void init() { super.init(); @@ -64,8 +62,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements getWidget().readonly = isReadOnly(); getWidget().updateReadOnly(); - immediate = getState().immediate; - getWidget().setTextInputEnabled(getState().textInputAllowed); if (getState().inputPrompt != null) { -- cgit v1.2.3