#5692 Generics: AbstractField, ComboBox, ListSelect, NativeSelect, OptionGroup and TwinColSelect (classes and collections of unknown type)

svn changeset:15346/svn branch:6.5

6 files changed, 9 insertions, 9 deletions

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index fb3065df99..4aa56a93f8 100644
--- 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 a9cdf21bd1..688f750e2b 100644
--- 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);

     }

 

-    public ComboBox(String caption, Collection options) {

+    public ComboBox(String caption, Collection<?> options) {

         super(caption, options);

         setMultiSelect(false);

         setNewItemsAllowed(false);

diff --git a/src/com/vaadin/ui/ListSelect.java b/src/com/vaadin/ui/ListSelect.java
index b2c4866b4a..9aabc7514a 100644
--- 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 e57daeda55..a99373dae8 100644
--- 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 7d6fac1721..c1b52c4a82 100644
--- 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 bcbc86a275..768b17911a 100644
--- 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);
     }