#5713 etc.: some BeanContainer, BeanItemContainer and AbstractBeanContainer changes based on review (API, generics, suppress warnings)

svn changeset:16231/svn branch:6.5

3 files changed, 14 insertions, 7 deletions

diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/src/com/vaadin/data/util/AbstractBeanContainer.java
index bb49297c4f..00e96e3a68 100644
--- a/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -92,7 +92,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BT> implements Indexed,
     /**
      * The type of the beans in the container.
      */
-    private final Class<? extends BT> type;
+    private final Class<? super BT> type;
 
     /**
      * A description of the properties found in beans of type {@link #type}.
@@ -114,7 +114,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BT> implements Indexed,
      * @throws IllegalArgumentException
      *             If {@code type} is null
      */
-    public AbstractBeanContainer(Class<? extends BT> type) {
+    protected AbstractBeanContainer(Class<? super BT> type) {
         if (type == null) {
             throw new IllegalArgumentException(
                     "The bean type passed to AbstractBeanContainer must not be null");
@@ -161,7 +161,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BT> implements Indexed,
      * 
      * @return
      */
-    public Class<? extends BT> getBeanType() {
+    public Class<? super BT> getBeanType() {
         return type;
     }
 
diff --git a/src/com/vaadin/data/util/BeanContainer.java b/src/com/vaadin/data/util/BeanContainer.java
index 9c264b9dce..81d89cdddb 100644
--- a/src/com/vaadin/data/util/BeanContainer.java
+++ b/src/com/vaadin/data/util/BeanContainer.java
@@ -34,7 +34,7 @@ import com.vaadin.data.Item;
 public class BeanContainer<IDTYPE, BT> extends
         AbstractBeanContainer<IDTYPE, BT> {
 
-    public BeanContainer(Class<? extends BT> type) {
+    public BeanContainer(Class<? super BT> type) {
         super(type);
     }
 
diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index aaa9a66675..78a2356a97 100644
--- a/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/src/com/vaadin/data/util/BeanItemContainer.java
@@ -44,7 +44,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * @throws IllegalArgumentException
      *             If {@code type} is null
      */
-    public BeanItemContainer(Class<? extends BT> type)
+    public BeanItemContainer(Class<? super BT> type)
             throws IllegalArgumentException {
         super(type);
     }
@@ -69,10 +69,13 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * 
      * @deprecated use {@link #BeanItemContainer(Class, Collection)} instead
      */
+    @SuppressWarnings("unchecked")
     @Deprecated
     public BeanItemContainer(Collection<? extends BT> collection)
             throws IllegalArgumentException {
-        super(getBeanClassForCollection(collection));
+        // must assume the class is BT
+        // the class information is erased by the compiler
+        super((Class<BT>) getBeanClassForCollection(collection));
 
         addAll(collection);
     }
@@ -86,6 +89,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * @return
      * @throws IllegalArgumentException
      */
+    @SuppressWarnings("unchecked")
     @Deprecated
     private static <BT> Class<? extends BT> getBeanClassForCollection(
             Collection<? extends BT> collection)
@@ -107,7 +111,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * @throws IllegalArgumentException
      *             If {@code type} is null
      */
-    public BeanItemContainer(Class<? extends BT> type,
+    public BeanItemContainer(Class<? super BT> type,
             Collection<? extends BT> collection)
             throws IllegalArgumentException {
         super(type);
@@ -167,6 +171,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * 
      * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
      */
+    @SuppressWarnings("unchecked")
     public BeanItem<BT> addItemAfter(Object previousItemId, Object newItemId) {
         return super.addItemAfter((BT) previousItemId, (BT) newItemId,
                 (BT) newItemId);
@@ -183,6 +188,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      *            The bean to add to the container.
      * @return Returns the new BeanItem or null if the operation fails.
      */
+    @SuppressWarnings("unchecked")
     public BeanItem<BT> addItemAt(int index, Object newItemId) {
         return super.addItemAt(index, (BT) newItemId, (BT) newItemId);
     }
@@ -194,6 +200,7 @@ public class BeanItemContainer<BT> extends AbstractBeanContainer<BT, BT> {
      * 
      * @see com.vaadin.data.Container#addItem(Object)
      */
+    @SuppressWarnings("unchecked")
     public BeanItem<BT> addItem(Object itemId) {
         BeanItem<BT> beanItem = addItem((BT) itemId, (BT) itemId);