#5692 Generics: AbstractField, ComboBox, ListSelect, NativeSelect, OptionGroup and...

svn changeset:15346/svn branch:6.5

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index fb3065df990cb399c6f2f4f49f845c27b4d86081..4aa56a93f8abb769fb5c7b5727a9fa5b9e315cf2 100644 (file)
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -174,7 +174,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * Gets the field type Don't add a JavaDoc comment here, we use the default
      * documentation from the implemented interface.
      */
-    public abstract Class getType();
+    public abstract Class<?> getType();
 
     /**
      * The abstract field is read only also if the data source is in read only
@@ -1015,7 +1015,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * @param propertyType
      *            the Type of the property, that needs to be edited.
      */
-    public static AbstractField constructField(Class propertyType) {
+    public static AbstractField constructField(Class<?> propertyType) {
 
         // Null typed properties can not be edited
         if (propertyType == null) {

diff --git a/src/com/vaadin/ui/ComboBox.java b/src/com/vaadin/ui/ComboBox.java
index a9cdf21bd1f9dfd253bbe900ba3b5488a994537e..688f750e2b6c237d2487bdad1da5653d9fde8b25 100644 (file)
--- a/src/com/vaadin/ui/ComboBox.java
+++ b/src/com/vaadin/ui/ComboBox.java
@@ -30,7 +30,7 @@ public class ComboBox extends Select {
         setNewItemsAllowed(false);\r
     }\r
 \r
-    public ComboBox(String caption, Collection options) {\r
+    public ComboBox(String caption, Collection<?> options) {\r
         super(caption, options);\r
         setMultiSelect(false);\r
         setNewItemsAllowed(false);\r

diff --git a/src/com/vaadin/ui/ListSelect.java b/src/com/vaadin/ui/ListSelect.java
index b2c4866b4a751695bf07c09359ee2b96a6417b17..9aabc7514a3692e20134a24e15ded1638b538d71 100644 (file)
--- a/src/com/vaadin/ui/ListSelect.java
+++ b/src/com/vaadin/ui/ListSelect.java
@@ -26,7 +26,7 @@ public class ListSelect extends AbstractSelect {
         super();
     }
 
-    public ListSelect(String caption, Collection options) {
+    public ListSelect(String caption, Collection<?> options) {
         super(caption, options);
     }
 

diff --git a/src/com/vaadin/ui/NativeSelect.java b/src/com/vaadin/ui/NativeSelect.java
index e57daeda559f185f7969f1263193d1c01a09f891..a99373dae80c2b3ed172fac079178dddacd54cb9 100644 (file)
--- a/src/com/vaadin/ui/NativeSelect.java
+++ b/src/com/vaadin/ui/NativeSelect.java
@@ -28,7 +28,7 @@ public class NativeSelect extends AbstractSelect {
         super();
     }
 
-    public NativeSelect(String caption, Collection options) {
+    public NativeSelect(String caption, Collection<?> options) {
         super(caption, options);
     }
 

diff --git a/src/com/vaadin/ui/OptionGroup.java b/src/com/vaadin/ui/OptionGroup.java
index 7d6fac1721e359a1789d62fa53c2099ec598dd09..c1b52c4a82c5bf8774a39b5cd74c063cdc00de8e 100644 (file)
--- a/src/com/vaadin/ui/OptionGroup.java
+++ b/src/com/vaadin/ui/OptionGroup.java
@@ -33,7 +33,7 @@ public class OptionGroup extends AbstractSelect implements
         super();
     }
 
-    public OptionGroup(String caption, Collection options) {
+    public OptionGroup(String caption, Collection<?> options) {
         super(caption, options);
     }
 
@@ -101,8 +101,8 @@ public class OptionGroup extends AbstractSelect implements
              * has selected a disabled item.
              */
             if (isMultiSelect()) {
-                Set currentValueSet = (Set) getValue();
-                Set newValueSet = (Set) newValue;
+                Set<?> currentValueSet = (Set<?>) getValue();
+                Set<?> newValueSet = (Set<?>) newValue;
                 for (Object itemId : currentValueSet) {
                     if (!isItemEnabled(itemId) && !newValueSet.contains(itemId)) {
                         requestRepaint();

diff --git a/src/com/vaadin/ui/TwinColSelect.java b/src/com/vaadin/ui/TwinColSelect.java
index bcbc86a2753ed7b683486f82f9c07663132dc36f..768b17911a95b59326cf67a7ea92193970425336 100644 (file)
--- a/src/com/vaadin/ui/TwinColSelect.java
+++ b/src/com/vaadin/ui/TwinColSelect.java
@@ -95,7 +95,7 @@ public class TwinColSelect extends AbstractSelect {
      * @param caption
      * @param options
      */
-    public TwinColSelect(String caption, Collection options) {
+    public TwinColSelect(String caption, Collection<?> options) {
         super(caption, options);
         setMultiSelect(true);
     }