Added generics from Container interface

svn changeset:10302/svn branch:6.2

diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index 10d3525581750ec46ce605e503b727ca39c9424d..7848de5eed950e9a3c15b0b5b84dfa41fcb48a91 100644 (file)
--- a/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/src/com/vaadin/data/util/BeanItemContainer.java
@@ -251,8 +251,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
         }
     }
 
-    @SuppressWarnings("unchecked")
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 41885910140c22b45aaded461791c77d607899d5..e0c13245532b7d04b65293437b1584ecfab434ce 100644 (file)
--- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -510,7 +510,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * @throws UnsupportedOperationException
      *             if the addContainerProperty is not supported.
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
 
         return container.addContainerProperty(propertyId, type, defaultValue);

diff --git a/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index 0d4600caaba17fe74115d5ea42dbd686f0b61ca1..44bd6a865305a2026f0e9221ac434edfa72dcc43 100644 (file)
--- a/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -299,7 +299,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * @return <code>true</code> if the operation succeeded, <code>false</code>
      *         if not
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
 
         return container.addContainerProperty(propertyId, type, defaultValue);
@@ -511,8 +511,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId)
@@ -537,8 +536,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {

diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java
index 3c8fcac92f03ffe4714601ba03413278d3fecab7..126e2237dd13ad6f3f75c02dff43918bc9e7599a 100644 (file)
--- a/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/src/com/vaadin/data/util/FilesystemContainer.java
@@ -828,11 +828,10 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.data.Container#addContainerProperty(java.lang.Object,
+     * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
                 "File system container does not support this operation");
@@ -882,9 +881,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.data.Container#removeContainerProperty(java.lang.Object
-     * )
+     * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object )
      */
     public boolean removeContainerProperty(Object propertyId)
             throws UnsupportedOperationException {

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index 609f4889386688659407b5a40020ee3673331ee0..c61b16bada779847264aeaa52fde16fa6435e7cb 100644 (file)
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -235,7 +235,7 @@ public class IndexedContainer implements Container.Indexed,
      * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) {
 
         // Fails, if nulls are given

diff --git a/src/com/vaadin/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java
index 1598d28ed8545099912b803cb2d310e42f5cbf96..96788947a915e2fd748acb175d5b181ee78e1e3c 100644 (file)
--- a/src/com/vaadin/data/util/QueryContainer.java
+++ b/src/com/vaadin/data/util/QueryContainer.java
@@ -341,7 +341,7 @@ public class QueryContainer implements Container, Container.Ordered,
      * @throws UnsupportedOperationException
      *             if the addContainerProperty method is not supported.
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 66cdaf8a658f7d698889a6d061f8692a5a4e34e1..b8ef6bc2067b55c507eb3ece62d8fae12ce892d3 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -718,7 +718,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      *      java.lang.Class, java.lang.Object)
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
 
         final boolean retval = items.addContainerProperty(propertyId, type,

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 11987445192cd5ae082a0338241202f2e935f6ba..3339dc90ec68c4d466fa01e4d728a670528d1038 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -2594,7 +2594,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *      Object)
      */
     @Override
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue) throws UnsupportedOperationException {
 
         boolean visibleColAdded = false;
@@ -2638,7 +2638,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
-    public boolean addContainerProperty(Object propertyId, Class type,
+    public boolean addContainerProperty(Object propertyId, Class<?> type,
             Object defaultValue, String columnHeader, Resource columnIcon,
             String columnAlignment) throws UnsupportedOperationException {
         if (!this.addContainerProperty(propertyId, type, defaultValue)) {

diff --git a/tests/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java b/tests/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java
index 260716a31df15eec71eaa03f7c8f0c3f11d19151..095af6c02d6dbbab549f385a59f3d77d07f24963 100644 (file)
--- a/tests/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java
+++ b/tests/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java
@@ -127,7 +127,7 @@ public class GeneratedColumnExample extends CustomComponent {
             items = new Vector<BeanItem>(); // Yeah this is just a test
         }
 
-        public boolean addContainerProperty(Object propertyId, Class type,
+        public boolean addContainerProperty(Object propertyId, Class<?> type,
                 Object defaultValue) throws UnsupportedOperationException {
             throw new UnsupportedOperationException();
         }

diff --git a/tests/src/com/vaadin/tests/book/TableEditableBean.java b/tests/src/com/vaadin/tests/book/TableEditableBean.java
index 847ff3e935a149c224af5c9ce2546dd721a26cba..e3828d29eece259196ce032fea18d8106f021970 100644 (file)
--- a/tests/src/com/vaadin/tests/book/TableEditableBean.java
+++ b/tests/src/com/vaadin/tests/book/TableEditableBean.java
@@ -92,7 +92,7 @@ public class TableEditableBean extends CustomComponent {
             items = new Item[100]; // Yeah this is just a test
         }
 
-        public boolean addContainerProperty(Object propertyId, Class type,
+        public boolean addContainerProperty(Object propertyId, Class<?> type,
                 Object defaultValue) throws UnsupportedOperationException {
             throw new UnsupportedOperationException();
         }

diff --git a/tests/src/com/vaadin/tests/book/TableHuge.java b/tests/src/com/vaadin/tests/book/TableHuge.java
index b3828a5a3bf170cf2d58a2193bfab4e9522be97e..191d4bbfc8e894f8a4f04388de1528bf4d84e107 100644 (file)
--- a/tests/src/com/vaadin/tests/book/TableHuge.java
+++ b/tests/src/com/vaadin/tests/book/TableHuge.java
@@ -30,7 +30,7 @@ public class TableHuge extends CustomComponent {
             this.numberofitems = numberofitems;
         }
 
-        public boolean addContainerProperty(Object propertyId, Class type,
+        public boolean addContainerProperty(Object propertyId, Class<?> type,
                 Object defaultValue) throws UnsupportedOperationException {
             throw new UnsupportedOperationException();
         }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index 7002602ca2f51947fff60a474c0898032cab7881..a9423f5b3e0aac0d1fd4e19a7d5d91a503ef8f36 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
@@ -110,7 +110,7 @@ public class Ticket1506_TestContainer implements Container {
         throw new UnsupportedOperationException("Not implemented");\r
     }\r
 \r
-    public boolean addContainerProperty(Object propertyId, Class type,\r
+    public boolean addContainerProperty(Object propertyId, Class<?> type,\r
             Object defaultValue) throws UnsupportedOperationException {\r
         throw new UnsupportedOperationException("Not implemented");\r
     }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 4345b3e58195b6515309f1e0b31c89f9a2307658..46be7e9fe44ec059f1807d5e660279c40498ecb6 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
@@ -102,7 +102,7 @@ public class Ticket1506_TestContainer2 implements Container {
         throw new UnsupportedOperationException("Not implemented");\r
     }\r
 \r
-    public boolean addContainerProperty(Object propertyId, Class type,\r
+    public boolean addContainerProperty(Object propertyId, Class<?> type,\r
             Object defaultValue) throws UnsupportedOperationException {\r
         throw new UnsupportedOperationException("Not implemented");\r
     }\r