merged [9405],[9404] from 6.1

svn changeset:9407/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
index c15c738a2978df99414d5ffda944339ecbe81fa6..52529ed468846bcf53a3451560ced22153ef2469 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
@@ -94,7 +94,7 @@ public class VEmbedded extends HTML implements Paintable {
 
             } else if (type.equals("browser")) {
                 if (browserElement == null) {
-                    setHTML("<iframe width=\"100%\" height=\"100%\" frameborder=\"0\" src=\""
+                    setHTML("<iframe width=\"100%\" height=\"100%\" frameborder=\"0\" allowTransparency=\"true\" src=\""
                             + getSrc(uidl, client)
                             + "\" name=\""
                             + uidl.getId() + "\"></iframe>");

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 7df90c8ca698554ab088d26de3653eaa2139c42c..767fc21bd2131b95d7c9cc613548cb77682f7006 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -590,8 +590,8 @@ public abstract class AbstractSelect extends AbstractField implements
     @Override
     public void setValue(Object newValue) throws Property.ReadOnlyException,
             Property.ConversionException {
-        if (newValue == null) {
-            newValue = getNullSelectionItemId();
+        if (newValue == getNullSelectionItemId()) {
+            newValue = null;
         }
 
         setValue(newValue, false);
@@ -1311,7 +1311,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * </p>
      * 
      * @param itemId
-     *            the tem to be selected.
+     *            the identifier of Item to be selected.
      * @see #getNullSelectionItemId()
      * @see #setNullSelectionItemId(Object)
      * 
@@ -1331,7 +1331,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * Unselects an item.
      * 
      * @param itemId
-     *            the Item to be unselected.
+     *            the identifier of the Item to be unselected.
      * @see #getNullSelectionItemId()
      * @see #setNullSelectionItemId(Object)
      *