diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/data/Container.java | 20 | ||||
| -rw-r--r-- | server/src/com/vaadin/data/ContainerHelpers.java | 6 | ||||
| -rw-r--r-- | server/src/com/vaadin/data/util/AbstractInMemoryContainer.java | 7 |
3 files changed, 9 insertions, 24 deletions
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java index 28d6cad18d..47a0f9e7c8 100644 --- a/server/src/com/vaadin/data/Container.java +++ b/server/src/com/vaadin/data/Container.java @@ -503,17 +503,13 @@ public interface Container extends Serializable { * container, starting with the item id at <code>startIndex</code>. <br> * <br> * - * Implementations should return the exact number of item ids given by - * <code>numberOfItems</code>. The returned list must hence contain all - * of the item ids from the range: <br> + * Implementations should return at most <code>numberOfItems</code> item + * ids, but can contain less if the container has less items than + * required to fulfill the request. The returned list must hence contain + * all of the item ids from the range: <br> * <br> * <code>startIndex</code> to - * <code>startIndex + (numberOfItems-1)</code>. <br> - * <br> - * - * The returned list must contain all of the requested item ids or throw - * a {@link RangeOutOfContainerBoundsException} to indicate that the - * container does not contain all the requested item ids.<br> + * <code>max(startIndex + (numberOfItems-1), container.size()-1)</code>. <br> * <br> * For quick migration to new API see: * {@link ContainerHelpers#getItemIdsUsingGetIdByIndex(int, int, Indexed)} @@ -521,8 +517,6 @@ public interface Container extends Serializable { * <br> * <b>Throws:</b> {@link IllegalArgumentException} if * <code>numberOfItems</code> is < 0 <br> - * <b>Throws:</b> {@link RangeOutOfContainerBoundsException} if all of - * the requested item ids cannot be fetched <br> * <b>Throws:</b> {@link IndexOutOfBoundsException} if * <code>startIndex</code> is outside the range of the container. (i.e. * <code>startIndex < 0 || container.size()-1 < startIndex</code>) @@ -532,8 +526,8 @@ public interface Container extends Serializable { * @param numberOfItems * the number of consecutive item ids to get from the given * start index, must be >= 0 - * @return List containing all of the requested item ids or empty list - * if <code>numberOfItems</code> == 0; not null + * @return List containing the requested item ids or empty list if + * <code>numberOfItems</code> == 0; not null * * @since 7.0 */ diff --git a/server/src/com/vaadin/data/ContainerHelpers.java b/server/src/com/vaadin/data/ContainerHelpers.java index 9ec2da4362..866fe97141 100644 --- a/server/src/com/vaadin/data/ContainerHelpers.java +++ b/server/src/com/vaadin/data/ContainerHelpers.java @@ -64,11 +64,7 @@ public class ContainerHelpers { int endIndex = startIndex + numberOfIds; if (endIndex > container.size()) { - throw new RangeOutOfContainerBoundsException( - "Cannot get all requested item ids from container. " - + "Container size might have changed, recalculate numberOfIds " - + "based on the actual container size!", - startIndex, numberOfIds, container.size()); + endIndex = container.size(); } ArrayList<Object> rangeOfIds = new ArrayList<Object>(); diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java index dbfcad3982..be8abe0c75 100644 --- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -26,7 +26,6 @@ import java.util.Set; import com.vaadin.data.Container; import com.vaadin.data.Container.ItemSetChangeNotifier; import com.vaadin.data.Item; -import com.vaadin.data.RangeOutOfContainerBoundsException; import com.vaadin.data.util.filter.SimpleStringFilter; import com.vaadin.data.util.filter.UnsupportedFilterException; @@ -278,11 +277,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE int endIndex = startIndex + numberOfIds; if (endIndex > getVisibleItemIds().size()) { - throw new RangeOutOfContainerBoundsException( - "Cannot get all requested item ids from container. " - + "Container size might have changed, recalculate numberOfIds " - + "based on the actual container size!", - startIndex, numberOfIds, getVisibleItemIds().size()); + endIndex = getVisibleItemIds().size(); } return Collections.unmodifiableList(getVisibleItemIds().subList( |