Revert "Update selection after changes in underlying data source

(#13580)."

This reverts commit f4d1383b20da01f9fc43c32d7541a7816f8a9a9b.

Change-Id: I5911f63ae35bef54f01477b14e5feffdf952aa6d

2 files changed, 0 insertions, 102 deletions

diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index d5e47b2286..423ebcb46a 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -1688,8 +1688,6 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
         // Clears the item id mapping table
         itemIdMapper.removeAll();
 
-        adjustSelection();
-
         // Notify all listeners
         fireItemSetChange();
     }
@@ -1728,25 +1726,6 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * Removes orphaned ids from selection.
-     * 
-     * @since 7.4
-     */
-    protected void adjustSelection() {
-        Object value = getValue();
-        if (isMultiSelect() && (value instanceof Collection)) {
-            Collection<?> collection = (Collection<?>) value;
-            for (Object id : collection) {
-                if (!containsId(id)) {
-                    unselect(id);
-                }
-            }
-        } else if (!containsId(value)) {
-            unselect(value);
-        }
-    }
-
-    /**
      * Implementation of item set change event.
      */
     private static class ItemSetChangeEvent extends EventObject implements
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectValueUpdate.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectValueUpdate.java
deleted file mode 100644
index e81f6e09b6..0000000000
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectValueUpdate.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.server.component.abstractselect;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.ui.AbstractSelect;
-
-public class TestAbstractSelectValueUpdate {
-
-    @Test
-    public void removeItem_deleteItemFromUnderlyingContainer_selectValueIsUpdated() {
-        BeanItemContainer<Object> container = new BeanItemContainer<Object>(
-                Object.class);
-        Object item1 = new Object();
-        Object item2 = new Object();
-        container.addBean(item1);
-        container.addBean(item2);
-        TestSelect select = new TestSelect();
-        select.setContainerDataSource(container);
-
-        select.setValue(item1);
-
-        Assert.assertNotNull("Value is null after selection", select.getValue());
-
-        container.removeItem(item1);
-
-        Assert.assertNull("Value is not null after removal", select.getValue());
-    }
-
-    @Test
-    public void removeItem_multiselectSectionDeleteItemFromUnderlyingContainer_selectValueIsUpdated() {
-        BeanItemContainer<Object> container = new BeanItemContainer<Object>(
-                Object.class);
-        Object item1 = new Object();
-        Object item2 = new Object();
-        container.addBean(item1);
-        container.addBean(item2);
-        TestSelect select = new TestSelect();
-        select.setMultiSelect(true);
-        select.setContainerDataSource(container);
-
-        select.setValue(Collections.singletonList(item1));
-
-        checkSelectedItemsCount(select, 1);
-
-        container.removeItem(item1);
-
-        checkSelectedItemsCount(select, 0);
-    }
-
-    private void checkSelectedItemsCount(TestSelect select, int count) {
-        Assert.assertNotNull("Selected value is null", select.getValue());
-        Assert.assertTrue("Selected value is not a collection",
-                select.getValue() instanceof Collection);
-        Assert.assertEquals("Wrong number of selected items",
-                ((Collection<?>) select.getValue()).size(), count);
-    }
-
-    private class TestSelect extends AbstractSelect {
-
-    }
-}