Fixed ambiguity issues with GWT 2.2-M1

svn changeset:17080/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
index e19079039dd9c4915f54d669b8be639e33881958..6dae3a338d35b492c3aac5532995eb889cd190b9 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
@@ -44,7 +44,7 @@ public class VListSelect extends VOptionGroupBase {
         if (!isMultiselect() && isNullSelectionAllowed()
                 && !isNullSelectionItemAvailable()) {
             // can't unselect last item in singleselect mode
-            select.addItem("", null);
+            select.addItem("", (String) null);
         }
         for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL optionUidl = (UIDL) i.next();

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
index eefde779cdcdbe5481bd80be265b80cc1c72b834..6261a3988aa1137c9d2970298611f8b0564f6db7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
@@ -39,7 +39,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field {
 
         if (isNullSelectionAllowed() && !isNullSelectionItemAvailable()) {
             // can't unselect last item in singleselect mode
-            select.addItem("", null);
+            select.addItem("", (String) null);
         }
         boolean selected = false;
         for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
@@ -54,7 +54,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field {
         if (!selected && !isNullSelectionAllowed()) {
             // null-select not allowed, but value not selected yet; add null and
             // remove when something is selected
-            select.insertItem("", null, 0);
+            select.insertItem("", (String) null, 0);
             select.setItemSelected(0, true);
             firstValueIsTemporaryNullItem = true;
         }