#6527 Container refactoring: move common parts of item removal to AbstractInMemoryContainer

svn changeset:17530/svn branch:6.6

1 files changed, 17 insertions, 10 deletions

diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/src/com/vaadin/data/util/AbstractBeanContainer.java
index 1c65003c9b..faeda2ad4c 100644
--- a/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -260,14 +260,16 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
      * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() {
-        allItemIds.clear();
-        getFilteredItemIds().clear();
+        internalRemoveAllItems();
+
         // detach listeners from all Items
         for (Item item : itemIdToItem.values()) {
             removeAllValueChangeListeners(item);
         }
         itemIdToItem.clear();
+
         fireItemSetChange();
+
         return true;
     }
 
@@ -312,16 +314,21 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
      * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId) {
-        if (!allItemIds.remove(itemId)) {
+        Item item = getItem(itemId);
+
+        if (internalRemoveItem(itemId)) {
+            // detach listeners from Item
+            removeAllValueChangeListeners(item);
+
+            // remove item
+            itemIdToItem.remove(itemId);
+
+            fireItemSetChange();
+
+            return true;
+        } else {
             return false;
         }
-        // detach listeners from Item
-        removeAllValueChangeListeners(getItem(itemId));
-        // remove item
-        itemIdToItem.remove(itemId);
-        getFilteredItemIds().remove(itemId);
-        fireItemSetChange();
-        return true;
     }
 
     /**