Merge commit 'e085e'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
	tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
index eb26faacc0..7ca73ef63d 100644
--- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -22,6 +22,7 @@ public class EmbedSizeTest extends TestBase {
         CheckBox lazyCheckBox = new CheckBox("Lazy resize");
         lazyCheckBox.addListener(new ValueChangeListener() {
 
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 CheckBox cb = (CheckBox) event.getProperty();
                 Boolean resizeLazy = cb.getValue();
@@ -34,11 +35,12 @@ public class EmbedSizeTest extends TestBase {
         addComponent(lazyCheckBox);
 
         addComponent(log);
+
         mainWindow.addListener(new Root.BrowserWindowResizeListener() {
+            @Override
             public void browserWindowResized(BrowserWindowResizeEvent event) {
                 log.log("Resize event: " + event.getWidth() + " x "
                         + event.getHeight());
-
             }
         });
     }