Resolve compile errors caused by merge of 6.8 branch

3 files changed, 7 insertions, 7 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
index 83eff1bdea..2b4ed733e0 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.button;
 import com.vaadin.tests.components.AbstractTestCase;

 import com.vaadin.ui.Button;

 import com.vaadin.ui.HorizontalLayout;

+import com.vaadin.ui.Root;

 import com.vaadin.ui.VerticalLayout;

-import com.vaadin.ui.Window;

 

 public class ButtonsInHorizontalLayout extends AbstractTestCase {

 

@@ -21,7 +21,7 @@ public class ButtonsInHorizontalLayout extends AbstractTestCase {
         layout.addComponent(new Button(

                 "Look at me in IE7 or IE8 in compatibility mode"));

         content.addComponent(layout);

-        setMainWindow(new Window("", content));

+        setMainWindow(new Root("", content));

     }

 

     @Override

diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index e0449dea8b..a0817ee0f0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
@@ -9,13 +9,13 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;

 import com.vaadin.ui.Label;

 import com.vaadin.ui.Layout;

+import com.vaadin.ui.Root;

 import com.vaadin.ui.Table;

 import com.vaadin.ui.VerticalLayout;

-import com.vaadin.ui.Window;

 

 public class TableClickValueChangeInteraction extends TestBase {

 

-    final Window mainWindow = new Window();

+    final Root mainWindow = new Root();

 

     @Override

     public void setup() {

diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index 6f2e507ce3..2f84c8a68d 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
@@ -31,7 +31,7 @@ public class ProgrammaticCollapse extends TestBase {
                 new ClickListener() {
                     public void buttonClick(ClickEvent event) {
                         boolean collapsed = !table.isCollapsed(1);
-                        table.getWindow().showNotification(
+                        table.getRoot().showNotification(
                                 "set collapsed: " + collapsed);
                         table.setCollapsed(1, collapsed);
                     }
@@ -40,7 +40,7 @@ public class ProgrammaticCollapse extends TestBase {
                 new ClickListener() {
                     public void buttonClick(ClickEvent event) {
                         boolean collapsed = !table.isCollapsed(100);
-                        table.getWindow().showNotification(
+                        table.getRoot().showNotification(
                                 "set collapsed: " + collapsed);
                         table.setCollapsed(100, collapsed);
                     }
@@ -51,7 +51,7 @@ public class ProgrammaticCollapse extends TestBase {
 
                     public void buttonClick(ClickEvent event) {
                         collapsed = !collapsed;
-                        table.getWindow().showNotification(
+                        table.getRoot().showNotification(
                                 "set collapsed: " + collapsed);
                         for (int i = 0; i < 50; ++i) {
                             table.setCollapsed(i * 2, collapsed);