#94 a fix to allow to use BeanItem in the container.

vaadin-lazyquerycontainer/src/main/java/org/vaadin/addons/lazyquerycontainer/LazyIdList.java

@@ -16,6 +16,7 @@
 package org.vaadin.addons.lazyquerycontainer;
 
 import com.vaadin.data.Item;
+import com.vaadin.data.util.BeanItem;
 
 import java.io.Serializable;
 import java.util.AbstractList;
@@ -88,7 +89,7 @@ public T get(final int index) {
         if (index < 0 || index >= lazyQueryView.size()) {
             throw new IndexOutOfBoundsException();
         }
-        final T itemId = (T) lazyQueryView.getItem(index).getItemProperty(idPropertyId).getValue();
+        final T itemId = getItemId(lazyQueryView.getItem(index));
         // Do not put added item ids to id index map and make sure that
         // existing item indexes start from 0 i.e. ignore added items as they
         // are compensated for in indexOf method.
@@ -99,6 +100,17 @@ public T get(final int index) {
         return itemId;
     }
 
+	private T getItemId(Item item) {
+		final T itemId;
+        if(item instanceof BeanItem 
+        		&& LazyQueryDefinition.ID_PROPERTY_ID_BEAN_SELF.equals(idPropertyId)) {
+        	 itemId = (T) ((BeanItem)item).getBean(); 	
+        }else {
+        	itemId = (T) item.getItemProperty(idPropertyId).getValue();
+        }
+		return itemId;
+	}
+
     /**
      * {@inheritDoc}
      */
@@ -116,7 +128,7 @@ public int indexOf(final Object o) {
         // Brute force added items first. There should only be a few.
         final List<Item> addedItems = lazyQueryView.getAddedItems();
         for (int i = 0; i < addedItems.size(); i++) {
-            if (o.equals(addedItems.get(i).getItemProperty(idPropertyId).getValue())) {
+            if (o.equals(getItemId(addedItems.get(i)))) {
                 return i;
             }
         }
@@ -126,7 +138,7 @@ public int indexOf(final Object o) {
         }
         // Switching to brute forcing.
         for (int i = addedItems.size(); i < lazyQueryView.size(); i++) {
-            if (o.equals(lazyQueryView.getItem(i).getItemProperty(idPropertyId).getValue())) {
+            if (o.equals(getItemId(lazyQueryView.getItem(i)))) {
                 return i;
             }
         }

vaadin-lazyquerycontainer/src/main/java/org/vaadin/addons/lazyquerycontainer/LazyQueryDefinition.java

@@ -32,6 +32,10 @@ public class LazyQueryDefinition implements QueryDefinition, Serializable {
      * Java serialization version UID.
      */
     private static final long serialVersionUID = 1L;
+    /**
+     * The ID of the ID property if the items of the container are BeanItems
+     */
+    public static final String ID_PROPERTY_ID_BEAN_SELF = "org.vaadin.addons.lazyquerycontainer.LazyQueryDefinition.ID_PROPERTY_ID_BEAN_SELF";
     /**
      * Lust of property IDs included in this QueryDefinition.
      */