From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 31 Jan 2011 10:40:50 +0000 (+0000)
Subject: Fixed ambiguity issues with GWT 2.2-M1
X-Git-Tag: 6.7.0.beta1~455
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a8e47cfd3cc7d42c218fb1a13f0a999f6c06a01;p=vaadin-framework.git

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 e19079039d..6dae3a338d 100644
--- 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 eefde779cd..6261a3988a 100644
--- 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;
         }