1 files changed, 22 insertions, 6 deletions
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java b/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java
index 2134c8cff3..22f7d103f4 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java
+++ b/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java
@@ -4,11 +4,15 @@
 
 package com.itmill.toolkit.automatedtests.featurebrowser;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
 import com.itmill.toolkit.ui.Select;
+import com.itmill.toolkit.ui.VerticalLayout;
+import com.itmill.toolkit.ui.Window.Notification;
 
 /**
  * Demonstrates the use of Embedded and "suggesting" Select by creating a simple
@@ -17,7 +21,7 @@ import com.itmill.toolkit.ui.Select;
  * @author IT Mill Ltd.
  * @see com.itmill.toolkit.ui.Window
  */
-public class EmbeddedBrowserExample extends ExpandLayout implements
+public class EmbeddedBrowserExample extends VerticalLayout implements
         Select.ValueChangeListener {
 
     // Default URL to open.
@@ -54,21 +58,33 @@ public class EmbeddedBrowserExample extends ExpandLayout implements
         select.addListener(this);
         select.setValue(urls[0]);
 
+        select.setWidth("100%");
+
         // configure the embedded and add to layout
         emb.setType(Embedded.TYPE_BROWSER);
+        emb.setSizeFull();
         addComponent(emb);
         // make the embedded as large as possible
-        expand(emb);
+        setExpandRatio(emb, 1);
 
     }
 
     public void valueChange(ValueChangeEvent event) {
         final String url = (String) event.getProperty().getValue();
         if (url != null) {
-            // the selected url has changed, let's go there
-            emb.setSource(new ExternalResource(url));
+            try {
+                // the selected url has changed, let's go there
+                @SuppressWarnings("unused")
+                URL u = new URL(url);
+                emb.setSource(new ExternalResource(url));
+
+            } catch (MalformedURLException e) {
+                getWindow().showNotification("Invalid address",
+                        e.getMessage() + " (example: http://www.itmill.com)",
+                        Notification.TYPE_WARNING_MESSAGE);
+            }
+
         }
 
     }
-
 }