diff options
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java index c15c738a29..52529ed468 100644 --- 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 7df90c8ca6..767fc21bd2 100644 --- 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) * |