#7517 IndexedContainer.addItem() performance improvement, related performance test

svn changeset:20789/svn branch:6.6

2 files changed, 16 insertions, 4 deletions

diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index 3a9a0a8987..3a48d9e0de 100644
--- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -722,7 +722,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
                     getAllItemIds().indexOf(previousItemId) + 1, newItemId,
                     item);
         }
-        if (newItem != null) {
+        if (newItem != null && filter) {
             // TODO filter only this item, use fireItemAdded()
             filterAll();
             if (!isFiltered()) {
diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index 7fbb1e9128..2f45def4f1 100644
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -106,8 +106,11 @@ public class IndexedContainer extends
         this();
         if (items != null) {
             for (final Iterator<?> i = itemIds.iterator(); i.hasNext();) {
-                this.addItem(i.next());
+                Object itemId = i.next();
+                internalAddItemAtEnd(itemId, new IndexedContainerItem(itemId),
+                        false);
             }
+            filterAll();
         }
     }
 
@@ -246,8 +249,17 @@ public class IndexedContainer extends
      */
     @Override
     public Item addItem(Object itemId) {
-        return internalAddItemAtEnd(itemId, new IndexedContainerItem(itemId),
-                true);
+        Item item = internalAddItemAtEnd(itemId, new IndexedContainerItem(
+                itemId), false);
+        if (!isFiltered()) {
+            // always the last item
+            fireItemAdded(size() - 1, itemId, item);
+        } else if (passesFilters(itemId)) {
+            getFilteredItemIds().add(itemId);
+            // always the last item
+            fireItemAdded(size() - 1, itemId, item);
+        }
+        return item;
     }
 
     /**