diff options
Diffstat (limited to 'tests')
300 files changed, 416 insertions, 416 deletions
diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/tests/server-side/com/vaadin/tests/VaadinClasses.java index 2f937bf58d..5d9e38398c 100644 --- a/tests/server-side/com/vaadin/tests/VaadinClasses.java +++ b/tests/server-side/com/vaadin/tests/VaadinClasses.java @@ -24,7 +24,7 @@ import com.vaadin.ui.Field; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.LoginForm; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; import com.vaadin.ui.themes.BaseTheme; @@ -107,7 +107,7 @@ public class VaadinClasses { classes.remove(DragAndDropWrapper.class); classes.remove(CustomComponent.class); classes.remove(LoginForm.class); - classes.remove(Root.class); + classes.remove(UI.class); return classes; } diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java index ca1bb45330..4e26ffaf45 100644 --- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java +++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java @@ -8,7 +8,7 @@ import com.vaadin.Application; import com.vaadin.terminal.StreamVariable; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.gwt.server.CommunicationManager; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Upload; public class TestStreamVariableMapping extends TestCase { @@ -22,7 +22,7 @@ public class TestStreamVariableMapping extends TestCase { @Override protected void setUp() throws Exception { final Application application = new Application(); - final Root root = new Root() { + final UI uI = new UI() { @Override protected void init(WrappedRequest request) { // TODO Auto-generated method stub @@ -36,8 +36,8 @@ public class TestStreamVariableMapping extends TestCase { }; owner = new Upload() { @Override - public Root getRoot() { - return root; + public UI getRoot() { + return uI; } }; streamVariable = EasyMock.createMock(StreamVariable.class); diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index f66f523770..dd1675c75d 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -10,7 +10,7 @@ import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.converter.Converter.ConversionException; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.AbstractField; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class RemoveListenersOnDetach { @@ -18,7 +18,7 @@ public class RemoveListenersOnDetach { int numReadOnlyChanges = 0; AbstractField field = new AbstractField() { - private Root root = new Root() { + private UI uI = new UI() { @Override protected void init(WrappedRequest request) { @@ -49,8 +49,8 @@ public class RemoveListenersOnDetach { } @Override - public com.vaadin.ui.Root getRoot() { - return root; + public com.vaadin.ui.UI getRoot() { + return uI; }; @Override diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java index 74770f8652..9fe486f85e 100644 --- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java +++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java @@ -14,14 +14,14 @@ import com.vaadin.RootRequiresMoreInformationException; import com.vaadin.terminal.DefaultRootProvider; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class CustomRootClassLoader extends TestCase { /** * Stub root */ - public static class MyRoot extends Root { + public static class MyRoot extends UI { @Override protected void init(WrappedRequest request) { // Nothing to see here @@ -45,7 +45,7 @@ public class CustomRootClassLoader extends TestCase { } /** - * Tests that a Root class can be loaded even if no classloader has been + * Tests that a UI class can be loaded even if no classloader has been * provided. * * @throws Exception @@ -56,8 +56,8 @@ public class CustomRootClassLoader extends TestCase { application.start(new ApplicationStartEvent(null, createConfigurationMock(), null)); - Root root = application.getRootForRequest(createRequestMock(null)); - assertTrue(root instanceof MyRoot); + UI uI = application.getRootForRequest(createRequestMock(null)); + assertTrue(uI instanceof MyRoot); } private static DeploymentConfiguration createConfigurationMock() { @@ -89,7 +89,7 @@ public class CustomRootClassLoader extends TestCase { /** * Tests that the ClassLoader passed in the ApplicationStartEvent is used to - * load Root classes. + * load UI classes. * * @throws Exception * if thrown @@ -101,9 +101,9 @@ public class CustomRootClassLoader extends TestCase { application.start(new ApplicationStartEvent(null, createConfigurationMock(), null)); - Root root = application + UI uI = application .getRootForRequest(createRequestMock(loggingClassLoader)); - assertTrue(root instanceof MyRoot); + assertTrue(uI instanceof MyRoot); assertEquals(1, loggingClassLoader.requestedClasses.size()); assertEquals(MyRoot.class.getName(), loggingClassLoader.requestedClasses.get(0)); @@ -126,7 +126,7 @@ public class CustomRootClassLoader extends TestCase { } @Override - public Root getRootForRequest(WrappedRequest request) + public UI getRootForRequest(WrappedRequest request) throws RootRequiresMoreInformationException { // Always create a new root for testing (can't directly use // getRoot as it's protected) diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java index f8901803c3..88bc28bbc8 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java @@ -7,8 +7,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import com.vaadin.Application; -import com.vaadin.ui.Root; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class AddRemoveSubWindow { @@ -27,7 +27,7 @@ public class AddRemoveSubWindow { TestApp app = new TestApp(); app.init(); Window subWindow = new Window("Sub window"); - Root mainWindow = app.getMainWindow(); + UI mainWindow = app.getMainWindow(); mainWindow.addWindow(subWindow); // Added to main window so the parent of the sub window should be the @@ -61,7 +61,7 @@ public class AddRemoveSubWindow { TestApp app = new TestApp(); app.init(); Window subWindow = new Window("Sub window"); - Root mainWindow = app.getMainWindow(); + UI mainWindow = app.getMainWindow(); mainWindow.addWindow(subWindow); // Added to main window so the parent of the sub window should be the diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java index e1435ea2ab..e2db224f08 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -8,7 +8,7 @@ import org.junit.Test; import com.vaadin.Application; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -100,7 +100,7 @@ public class AttachDetachWindow { } } - private class TestRoot extends Root implements TestContainer { + private class TestRoot extends UI implements TestContainer { boolean rootAttachCalled = false; boolean rootDetachCalled = false; private TestContent testContent = new TestContent();; diff --git a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java index 7713f69f68..12d3a3c8f5 100644 --- a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java +++ b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java @@ -7,7 +7,7 @@ import junit.framework.TestCase; import org.easymock.EasyMock; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.CloseEvent; import com.vaadin.ui.Window.CloseListener; diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index bb37082d30..2ac447cee3 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -36,7 +36,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; import com.vaadin.terminal.gwt.server.WrappedHttpServletRequest; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; @SuppressWarnings("serial") public class ApplicationRunnerServlet extends AbstractApplicationServlet { @@ -110,15 +110,15 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { // Creates a new application instance try { final Class<?> classToRun = getClassToRun(); - if (Root.class.isAssignableFrom(classToRun)) { + if (UI.class.isAssignableFrom(classToRun)) { Application application = new Application(); application.addRootProvider(new AbstractRootProvider() { @Override - public Class<? extends Root> getRootClass( + public Class<? extends UI> getRootClass( Application application, WrappedRequest request) throws RootRequiresMoreInformationException { - return (Class<? extends Root>) classToRun; + return (Class<? extends UI>) classToRun; } }); return application; @@ -126,7 +126,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { return (Application) classToRun.newInstance(); } else { throw new ServletException(classToRun.getCanonicalName() - + " is neither an Application nor a Root"); + + " is neither an Application nor a UI"); } } catch (final IllegalAccessException e) { throw new ServletException(e); @@ -215,13 +215,13 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { protected Class<? extends Application> getApplicationClass() throws ClassNotFoundException { Class<?> classToRun = getClassToRun(); - if (Root.class.isAssignableFrom(classToRun)) { + if (UI.class.isAssignableFrom(classToRun)) { return Application.class; } else if (Application.class.isAssignableFrom(classToRun)) { return classToRun.asSubclass(Application.class); } else { throw new ClassCastException(classToRun.getCanonicalName() - + " is not an Application nor a Root"); + + " is not an Application nor a UI"); } } diff --git a/tests/testbench/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java index f4fa1b6608..66e693a1de 100644 --- a/tests/testbench/com/vaadin/tests/Components.java +++ b/tests/testbench/com/vaadin/tests/Components.java @@ -25,7 +25,7 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ItemStyleGenerator; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java index ce99f6e70f..833340f678 100644 --- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java @@ -26,7 +26,7 @@ import com.vaadin.ui.Field; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.PasswordField; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java index 1a3801aecc..23997ac084 100644 --- a/tests/testbench/com/vaadin/tests/LayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java @@ -25,7 +25,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/tests/testbench/com/vaadin/tests/ListenerOrder.java index 7f136b10ed..ab364a8781 100644 --- a/tests/testbench/com/vaadin/tests/ListenerOrder.java +++ b/tests/testbench/com/vaadin/tests/ListenerOrder.java @@ -13,7 +13,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; public class ListenerOrder extends com.vaadin.Application.LegacyApplication diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java index 84fa761eb4..6153f14285 100644 --- a/tests/testbench/com/vaadin/tests/ModalWindow.java +++ b/tests/testbench/com/vaadin/tests/ModalWindow.java @@ -20,7 +20,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 70f978a8b1..4bce92b668 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -24,7 +24,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class NativeWindowing extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index e9824d9c40..d6bc9007ed 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -30,7 +30,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java index 711e79a28d..0161a2a20e 100644 --- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java +++ b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java @@ -29,7 +29,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java index 9cd27e9d5c..7436bfc539 100644 --- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java @@ -10,7 +10,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index b58df225bc..32fff09455 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -37,7 +37,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index 78ab9f61ca..c3fa269fba 100644 --- a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index 628c3cc4e8..41b3309c57 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -24,7 +24,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class TestForNativeWindowing extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index 120cf9a59a..af41ccc37b 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -36,7 +36,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.FailedEvent; import com.vaadin.ui.Upload.FailedListener; diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java index 621bdbfee2..3b5c7404e7 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java @@ -20,7 +20,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; public class TestForWindowOpen extends CustomComponent { @@ -37,7 +37,7 @@ public class TestForWindowOpen extends CustomComponent { public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); - Root.getCurrent().getPage().open(r); + UI.getCurrent().getPage().open(r); } @@ -50,7 +50,7 @@ public class TestForWindowOpen extends CustomComponent { public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); - Root.getCurrent().getPage().open(r, "mytarget"); + UI.getCurrent().getPage().open(r, "mytarget"); } @@ -63,7 +63,7 @@ public class TestForWindowOpen extends CustomComponent { public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); - Root.getCurrent().getPage().open(r, "secondtarget"); + UI.getCurrent().getPage().open(r, "secondtarget"); } diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/tests/testbench/com/vaadin/tests/TestForWindowing.java index 9a3362af8b..a59323b97c 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowing.java @@ -26,7 +26,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Select; import com.vaadin.ui.Slider; import com.vaadin.ui.VerticalLayout; @@ -99,7 +99,7 @@ public class TestForWindowing extends CustomComponent { w.addComponent(s); - Root.getCurrent().addWindow(w); + UI.getCurrent().addWindow(w); } diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java index 5b3a93e065..6bb8bac200 100644 --- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -21,7 +21,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class TestSetVisibleAndCaching extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index f33132a709..a0ff6f0fc7 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -37,7 +37,7 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/TestSplitPanel.java b/tests/testbench/com/vaadin/tests/TestSplitPanel.java index d1a6ede53c..4b0b47ed74 100644 --- a/tests/testbench/com/vaadin/tests/TestSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/TestSplitPanel.java @@ -17,7 +17,7 @@ package com.vaadin.tests; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalSplitPanel; public class TestSplitPanel extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java index b311ae32b1..f2a0d97b08 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java @@ -23,7 +23,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ExpandEvent; diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java index 52dd61dbee..672c518ea8 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java @@ -26,7 +26,7 @@ import com.vaadin.ui.Component.Listener; import com.vaadin.ui.Field; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java index cf2516fbff..48e2222d7e 100644 --- a/tests/testbench/com/vaadin/tests/UpgradingSample.java +++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java @@ -31,7 +31,7 @@ import com.vaadin.ui.CustomComponent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java index 42a9d358c5..c5a836b4f1 100644 --- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java @@ -24,7 +24,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; public class UsingObjectsInSelect extends diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java index fbf9e7b46e..7a06dedd63 100644 --- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class GAESyncTest extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java index 690df3f360..2e6c188331 100644 --- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java +++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java @@ -10,7 +10,7 @@ import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.PasswordField; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java index bd2aea3756..023a93438d 100644 --- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java +++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java @@ -6,16 +6,16 @@ import com.vaadin.terminal.AbstractRootProvider; import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class RefreshStatePreserve extends AbstractTestApplication { - public static class RefreshStateRoot extends Root { + public static class RefreshStateRoot extends UI { @Override public void init(WrappedRequest request) { getContent().addComponent( new Label("window.name: " + request.getBrowserDetails().getWindowName())); - getContent().addComponent(new Label("Root id: " + getRootId())); + getContent().addComponent(new Label("UI id: " + getRootId())); } } @@ -25,7 +25,7 @@ public class RefreshStatePreserve extends AbstractTestApplication { setRootPreserved(true); addRootProvider(new AbstractRootProvider() { @Override - public Class<? extends Root> getRootClass(Application application, + public Class<? extends UI> getRootClass(Application application, WrappedRequest request) throws RootRequiresMoreInformationException { return RefreshStateRoot.class; diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index 77596da0f9..992a3afbca 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -19,7 +19,7 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class TerminalErrorNotification extends TestBase { @@ -41,7 +41,7 @@ public class TerminalErrorNotification extends TestBase { public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { event.getThrowable().printStackTrace(); - Root mainWindow = getMainWindow(); + UI mainWindow = getMainWindow(); if (mainWindow != null) { Throwable throwable = event.getThrowable(); diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java index def68a7357..3323e3bb28 100644 --- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java @@ -12,14 +12,14 @@ import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Embedded; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class ThreadLocalInstances extends AbstractTestApplication { private static final Application staticInitApplication = Application .getCurrent(); - private static final Root staticInitRoot = Root.getCurrent(); + private static final UI staticInitRoot = UI.getCurrent(); - private final Root mainWindow = new Root() { + private final UI mainWindow = new UI() { boolean paintReported = false; @Override @@ -77,14 +77,14 @@ public class ThreadLocalInstances extends AbstractTestApplication { } @Override - protected Root getRoot(WrappedRequest request) + protected UI getRoot(WrappedRequest request) throws RootRequiresMoreInformationException { return mainWindow; } @Override protected String getTestDescription() { - return "Tests the precence of Application.getCurrentApplication() and Root.getCurrentRoot() from different contexts"; + return "Tests the precence of Application.getCurrentApplication() and UI.getCurrentRoot() from different contexts"; } @Override @@ -93,12 +93,12 @@ public class ThreadLocalInstances extends AbstractTestApplication { } private void reportCurrentStatus(String phase) { - reportStatus(phase, Application.getCurrent(), Root.getCurrent()); + reportStatus(phase, Application.getCurrent(), UI.getCurrent()); } - private void reportStatus(String phase, Application application, Root root) { + private void reportStatus(String phase, Application application, UI uI) { log.log(getState(application, this) + " app in " + phase); - log.log(getState(root, mainWindow) + " root in " + phase); + log.log(getState(uI, mainWindow) + " root in " + phase); } private static String getState(Object value, Object reference) { diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java index abcdf232cd..3169806f27 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -6,7 +6,7 @@ import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class ChangeSessionId extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java b/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java index d20f7a4a21..cf4bfac426 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java @@ -8,10 +8,10 @@ import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -public abstract class AbstractTestRoot extends Root { +public abstract class AbstractTestRoot extends UI { @Override public void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/components/TestBase.java b/tests/testbench/com/vaadin/tests/components/TestBase.java index a66f0efe64..19c6826977 100644 --- a/tests/testbench/com/vaadin/tests/components/TestBase.java +++ b/tests/testbench/com/vaadin/tests/components/TestBase.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public abstract class TestBase extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java index f8931ecdea..e93529fad4 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -6,7 +6,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class EnableState extends AbstractTestCase { @Override diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java index bdabed3032..3a0afdce50 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java @@ -3,7 +3,7 @@ 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.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index 5dc5a2efbd..10afb05ae3 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -8,7 +8,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") diff --git a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java index 37b0fe21a1..f64fd6f5fa 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java @@ -5,7 +5,7 @@ import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Select; @SuppressWarnings("serial") @@ -13,7 +13,7 @@ public class GridLayoutComboBoxZoomOut extends AbstractTestCase { @Override public void init() { - Root.LegacyWindow mainWindow = new Root.LegacyWindow( + UI.LegacyWindow mainWindow = new UI.LegacyWindow( "Gridlayoutbug Application"); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 85f1c80a08..4cf7b98679 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -13,7 +13,7 @@ import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Field; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java index b87c458c01..ac3296724b 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.DateField; import com.vaadin.ui.DateField.Resolution; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class DateFieldPopupOffScreen extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java index 21430d8936..b34db2170e 100644 --- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java +++ b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; @SuppressWarnings("serial") diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java index bbe88b1770..360c559086 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java index 2c0a8744fc..db64df936f 100755 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.LoginForm;
import com.vaadin.ui.LoginForm.LoginEvent;
import com.vaadin.ui.LoginForm.LoginListener;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
public class LoginFormRootInLoginHandler extends TestBase {
@@ -16,14 +16,14 @@ public class LoginFormRootInLoginHandler extends TestBase { @Override
public void onLogin(LoginEvent event) {
- Root r1 = Root.getCurrent();
+ UI r1 = UI.getCurrent();
if (r1 != null) {
- addComponent(new Label("Root.getCurrent().data: "
+ addComponent(new Label("UI.getCurrent().data: "
+ r1.getData()));
} else {
- addComponent(new Label("Root.getCurrent() is null"));
+ addComponent(new Label("UI.getCurrent() is null"));
}
- Root r2 = ((LoginForm) event.getSource()).getRoot();
+ UI r2 = ((LoginForm) event.getSource()).getRoot();
if (r2 != null) {
addComponent(new Label("event.getSource().data: "
+ r2.getData()));
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 83f89f0214..515734338b 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -5,14 +5,14 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.LoginForm; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; -import com.vaadin.ui.Root; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI; +import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class LoginFormWithMultipleWindows extends Application { @Override - protected Root getRoot(WrappedRequest request) { + protected UI getRoot(WrappedRequest request) { return new LoginFormWindow(); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java index 2a6f952c0a..59aebd0bd7 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java @@ -4,7 +4,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java index 33e6c0b4a9..2c4a975f9b 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java @@ -4,7 +4,7 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Alignment; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class MenuBarRunsOutOfBrowser extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index 945ccf0e28..bc76a0c0ce 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -4,7 +4,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java index 254410a549..aca7211aec 100644 --- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java +++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java @@ -9,12 +9,12 @@ import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; import com.vaadin.ui.Link; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class LazyInitRoots extends AbstractTestApplication { @EagerInit - private static class EagerInitRoot extends Root { + private static class EagerInitRoot extends UI { @Override public void init(WrappedRequest request) { addComponent(getRequestInfo("EagerInitRoot", request)); @@ -22,29 +22,29 @@ public class LazyInitRoots extends AbstractTestApplication { } @Override - public Root getRoot(WrappedRequest request) + public UI getRoot(WrappedRequest request) throws RootRequiresMoreInformationException { if (request.getParameter("lazyCreate") != null) { - // Root created on second request + // UI created on second request BrowserDetails browserDetails = request.getBrowserDetails(); if (browserDetails == null || browserDetails.getUriFragment() == null) { throw new RootRequiresMoreInformationException(); } else { - Root root = new Root() { + UI uI = new UI() { @Override protected void init(WrappedRequest request) { addComponent(getRequestInfo("LazyCreateRoot", request)); } }; - return root; + return uI; } } else if (request.getParameter("eagerInit") != null) { - // Root inited on first request + // UI inited on first request return new EagerInitRoot(); } else { // The standard root - Root root = new Root() { + UI uI = new UI() { @Override protected void init(WrappedRequest request) { addComponent(getRequestInfo("NormalRoot", request)); @@ -63,7 +63,7 @@ public class LazyInitRoots extends AbstractTestApplication { } }; - return root; + return uI; } } @@ -78,7 +78,7 @@ public class LazyInitRoots extends AbstractTestApplication { @Override protected String getTestDescription() { - return "BrowserDetails should be available in Application.getRoot if RootRequiresMoreInformation has been thrown and in Root.init if the root has the @RootInitRequiresBrowserDetals annotation"; + return "BrowserDetails should be available in Application.getRoot if RootRequiresMoreInformation has been thrown and in UI.init if the root has the @RootInitRequiresBrowserDetals annotation"; } @Override diff --git a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java index ae3182401d..4309b6e942 100644 --- a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java +++ b/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java @@ -6,12 +6,12 @@ import com.vaadin.terminal.AbstractRootProvider; import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class RootsInMultipleTabs extends AbstractTestApplication { private int numberOfRootsOpened; - public static class TabRoot extends Root { + public static class TabRoot extends UI { @Override protected void init(WrappedRequest request) { RootsInMultipleTabs application = (RootsInMultipleTabs) getApplication(); @@ -25,7 +25,7 @@ public class RootsInMultipleTabs extends AbstractTestApplication { public RootsInMultipleTabs() { addRootProvider(new AbstractRootProvider() { @Override - public Class<? extends Root> getRootClass(Application application, + public Class<? extends UI> getRootClass(Application application, WrappedRequest request) throws RootRequiresMoreInformationException { return TabRoot.class; @@ -35,7 +35,7 @@ public class RootsInMultipleTabs extends AbstractTestApplication { @Override protected String getTestDescription() { - return "Opening the same application again (e.g. in a new tab) should create a new Root."; + return "Opening the same application again (e.g. in a new tab) should create a new UI."; } @Override diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java b/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java index 77c0bdb150..7a734e8497 100644 --- a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java +++ b/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java @@ -17,7 +17,7 @@ public class TestRootTheme extends AbstractTestRoot { @Override public String getTestDescription() { - return "Root with @RootTheme(\"tests-tickets\")"; + return "UI with @RootTheme(\"tests-tickets\")"; } @Override diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index 00012522ca..5554b2b9f3 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class SplitPanelExtraScrollbars extends AbstractTestCase implements ClickListener { diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java index e80ad29426..3cdc0c8913 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java @@ -5,7 +5,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java index 75468af247..edd524d657 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java +++ b/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java @@ -7,7 +7,7 @@ import com.vaadin.data.util.BeanItemContainer; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Person; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class ScrollCausesRequestLoop extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java index 15872aa849..afc63c0eda 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.AbstractTestCase; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java index 010093bf8f..f8fb624c0b 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java @@ -4,7 +4,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.AbstractTestCase; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java index 3101615cfd..90df5610eb 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java @@ -5,7 +5,7 @@ import com.vaadin.data.Container; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java b/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java index bce96ebced..26f8e25d3b 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CssLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class TableHeaderZoom extends TestBase { diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 0173f928dd..6bbf06635a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -4,7 +4,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; /** diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java index 0465d2f886..9ca2605cd9 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index d629c9a917..c563312efa 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -7,7 +7,7 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index 8e4c4d40fb..1934649902 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java index 3e1a709243..903226c87c 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.textfield; import com.vaadin.Application; import com.vaadin.ui.Component; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java index 9d58762f60..892b7e669a 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java index abc9a5385d..70c2d5d433 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java index 329e5d291d..8f9c1deaf5 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.treetable; import com.vaadin.terminal.ExternalResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Link; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TreeTable; public class DisappearingComponents extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index 52a94daec7..a2f03212b0 100644 --- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Window; public class AttachShouldBeCalledForSubWindows extends AbstractTestCase @@ -26,7 +26,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase @Override public void init() { - Root.LegacyWindow mainWindow = new Root.LegacyWindow() { + UI.LegacyWindow mainWindow = new UI.LegacyWindow() { @Override public void attach() { log(this); diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java index a9744b2c06..92e0e734ff 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -4,7 +4,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class ExecuteJavaScript extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java index eb4803630f..80497528ca 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java @@ -10,7 +10,7 @@ import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java index 061ee7900f..e4a7e288ad 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java @@ -11,7 +11,7 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -64,7 +64,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase { } }); - Root main = getLayout().getRoot(); + UI main = getLayout().getRoot(); main.addWindow(window); diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java index 02241476d5..0ca7fd1067 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java @@ -10,7 +10,7 @@ import com.vaadin.ui.ComboBox; import com.vaadin.ui.CssLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Window; public class SubWindowOrder extends TestBase { @@ -20,7 +20,7 @@ public class SubWindowOrder extends TestBase { @Override protected void setup() { - Root mainWindow = getMainWindow(); + UI mainWindow = getMainWindow(); HorizontalLayout controlpanels = new HorizontalLayout(); for (int i = 1; i <= 5; i++) { Window dialog = new Window("Dialog " + i); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index fdeb21d29c..033de48446 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java index 43f8297a5d..0f0db3a028 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class WindowScrollingUp extends AbstractTestCase { diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index 537c9be973..0c1fdc23f6 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class CheckboxUpdateProblem extends Application.LegacyApplication diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java index b7d1b8c37e..aec0f0e28e 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java @@ -3,7 +3,7 @@ package com.vaadin.tests.containers.sqlcontainer; import com.vaadin.Application; import com.vaadin.ui.AbstractSelect.Filtering; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * See http://dev.vaadin.com/ticket/9155 . @@ -13,7 +13,7 @@ public class ComboBoxUpdateProblem extends Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root.LegacyWindow("Test window")); + setMainWindow(new UI.LegacyWindow("Test window")); ComboBox combo = new ComboBox("Names", databaseHelper.getTestContainer()); diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index dc919fdb12..8bb2ba1092 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; // author table in testdb (MySQL) is set out as follows diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/tests/testbench/com/vaadin/tests/dd/DDTest2.java index 272be53034..99020d0b5b 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest2.java @@ -24,7 +24,7 @@ import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; import com.vaadin.ui.Tree; @@ -45,7 +45,7 @@ public class DDTest2 extends TestBase { @Override protected void setup() { - Root w = getLayout().getRoot(); + UI w = getLayout().getRoot(); /* darn reindeer has no icons */ /* Make all trees (their nodes actually) draggable */ diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest4.java b/tests/testbench/com/vaadin/tests/dd/DDTest4.java index c7f0c6960b..bb85dff0b6 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest4.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest4.java @@ -16,7 +16,7 @@ import com.vaadin.tests.util.PersonContainer; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Table; public class DDTest4 extends TestBase { @@ -28,7 +28,7 @@ public class DDTest4 extends TestBase { @Override protected void setup() { - Root w = getLayout().getRoot(); + UI w = getLayout().getRoot(); TestUtils .injectCSS( diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest5.java b/tests/testbench/com/vaadin/tests/dd/DDTest5.java index 63d1e9e3c2..cb99b17da4 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest5.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest5.java @@ -15,7 +15,7 @@ import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class DDTest5 extends TestBase { @@ -47,7 +47,7 @@ public class DDTest5 extends TestBase { @Override protected void setup() { - Root w = getLayout().getRoot(); + UI w = getLayout().getRoot(); HorizontalSortableCssLayoutWithWrappers verticalSortableCssLayoutWithWrappers = new HorizontalSortableCssLayoutWithWrappers(); w.addWindow(verticalSortableCssLayoutWithWrappers); diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest7.java b/tests/testbench/com/vaadin/tests/dd/DDTest7.java index f9be935b23..2af93c6c72 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest7.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest7.java @@ -16,7 +16,7 @@ import com.vaadin.tests.util.PersonContainer; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Table; public class DDTest7 extends TestBase { @@ -29,7 +29,7 @@ public class DDTest7 extends TestBase { @Override protected void setup() { - Root w = getLayout().getRoot(); + UI w = getLayout().getRoot(); TestUtils .injectCSS( diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java index f1345bca13..6a9f696e75 100644 --- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java +++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java @@ -7,7 +7,7 @@ import com.vaadin.terminal.Page.BrowserWindowResizeEvent; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class EmbedSizeTest extends TestBase { diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java index c464409153..b3fc9c8ffb 100644 --- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -7,7 +7,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.Resource; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class IntegrationTestApplication extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java index 3374342947..c2a01b16dd 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -28,8 +28,8 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; @@ -101,13 +101,13 @@ public class JSR286PortletApplication extends Application.LegacyApplication { @Override public void handleActionRequest(ActionRequest request, - ActionResponse response, Root window) { + ActionResponse response, UI window) { main.addComponent(new Label("Action received")); } @Override public void handleRenderRequest(RenderRequest request, - RenderResponse response, Root window) { + RenderResponse response, UI window) { // Portlet up-and-running, enable stuff portletEdit.setEnabled(true); portletMax.setEnabled(true); @@ -181,13 +181,13 @@ public class JSR286PortletApplication extends Application.LegacyApplication { @Override public void handleEventRequest(EventRequest request, - EventResponse response, Root window) { + EventResponse response, UI window) { // events not used by this test } @Override public void handleResourceRequest(ResourceRequest request, - ResourceResponse response, Root window) { + ResourceResponse response, UI window) { // nothing special to do here } } diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java index a35b78c219..41a3d18f9f 100644 --- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -39,7 +39,7 @@ import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Slider; import com.vaadin.ui.Slider.ValueOutOfBoundsException; import com.vaadin.ui.TabSheet; diff --git a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java index 20967203bc..fc54547890 100644 --- a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java @@ -2,7 +2,7 @@ package com.vaadin.tests.integration; import com.vaadin.Application.LegacyApplication; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index 51f9e2d88e..25821cb92c 100644 --- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -4,7 +4,7 @@ import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java index 8713208dc6..2d5bc8d59a 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -15,7 +15,7 @@ import com.vaadin.ui.Form; import com.vaadin.ui.FormFieldFactory; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 84f27e5f03..acc5f07103 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java index d6ea84e44e..6273b92838 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class GridLayoutInsidePanel2 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index 5f91786571..0621fd5d92 100644 --- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -14,7 +14,7 @@ import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; import com.vaadin.ui.LoginForm; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Window; public class MovingComponentsWhileOldParentInvisible extends TestBase { @@ -45,7 +45,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { if (cls == LoginForm.class || cls == CustomLayout.class || CustomComponent.class.isAssignableFrom(cls) || cls == PopupView.class || cls == Window.class - || cls == Root.class) { + || cls == UI.class) { // Does not support addComponent continue; } diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java index b998abeb02..44f40a7d78 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -13,7 +13,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java index 8d506e0884..8786ae282c 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java @@ -2,7 +2,7 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 916a82bb85..ef24150762 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index 90193be7cc..e31ecc2498 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -11,7 +11,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 00d336de92..08556e99d0 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -20,7 +20,7 @@ import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.util.BeanItem; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -30,7 +30,7 @@ import com.vaadin.ui.Root; * @author Vaadin Ltd * @since 7.0.0 */ -public class AutoGeneratingForm extends Root { +public class AutoGeneratingForm extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java index 43e404b461..f3e6653288 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; /** @@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout; * @author Vaadin Ltd * @since 7.0.0 */ -public class BasicApplication extends Root { +public class BasicApplication extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index 0a04aead7f..4181c071f0 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.TextField; /** @@ -28,7 +28,7 @@ import com.vaadin.ui.TextField; * @author Vaadin Ltd * @since 7.0.0 */ -public class CreatingPreserveState extends Root { +public class CreatingPreserveState extends UI { private static int windowCounter = 0; @Override diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java index 5296f03c30..6c9282eb01 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java @@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.annotations.Theme; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout; * @since 7.0.0 */ @Theme("hello-theme") -public class DefineRootTheme extends Root { +public class DefineRootTheme extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 616fea7ff2..a601ff2eb4 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -22,7 +22,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -35,7 +35,7 @@ import com.vaadin.ui.Root; public class DifferentFeaturesForDifferentClients extends Application { @Override - protected Root getRoot(WrappedRequest request) + protected UI getRoot(WrappedRequest request) throws RootRequiresMoreInformationException { BrowserDetails browserDetails = request.getBrowserDetails(); // This is a limitation of 7.0.0.alpha1 that there is no better way to @@ -53,7 +53,7 @@ public class DifferentFeaturesForDifferentClients extends Application { } } -class DefaultRoot extends Root { +class DefaultRoot extends UI { @Override protected void init(WrappedRequest request) { getContent().addComponent( @@ -61,7 +61,7 @@ class DefaultRoot extends Root { } } -class TouchRoot extends Root { +class TouchRoot extends UI { @Override protected void init(WrappedRequest request) { WebBrowser webBrowser = request.getBrowserDetails().getWebBrowser(); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java index d53ede3518..a786ecb533 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -32,7 +32,7 @@ import com.vaadin.ui.Root; * @author Vaadin Ltd * @since 7.0.0 */ -public class FindCurrentRootAndApplication extends Root { +public class FindCurrentRootAndApplication extends UI { @Override protected void init(WrappedRequest request) { @@ -50,8 +50,8 @@ public class FindCurrentRootAndApplication extends Root { helloButton.addListener(new ClickListener() { @Override public void buttonClick(ClickEvent event) { - Notification.show("This Root is " - + Root.getCurrent().getClass().getSimpleName()); + Notification.show("This UI is " + + UI.getCurrent().getClass().getSimpleName()); } }); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index d2b1ed95e0..d82f4b1382 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -20,7 +20,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.Link; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout; * @author Vaadin Ltd * @since 7.0.0 */ -public class MultiTabApplication extends Root { +public class MultiTabApplication extends UI { private class MainView extends VerticalLayout { public MainView() { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java index 906ace6f53..c2f983c9bb 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java @@ -23,7 +23,7 @@ import javax.validation.constraints.Size; import com.vaadin.data.util.BeanItem; import com.vaadin.data.validator.BeanValidator; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.TextField; /** @@ -34,7 +34,7 @@ import com.vaadin.ui.TextField; * @author Vaadin Ltd * @since 7.0.0 */ -public class UsingBeanValidation extends Root { +public class UsingBeanValidation extends UI { class Person { @Size(min = 5, max = 50) diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index db6ee57477..042c02316f 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -22,7 +22,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -31,7 +31,7 @@ import com.vaadin.ui.Root; * @author Vaadin Ltd * @since 7.0.0 */ -public class UsingUriFragments extends Root { +public class UsingUriFragments extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index 64b643a185..4a689d8c12 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -28,7 +28,7 @@ import com.vaadin.ui.Root; * @author Vaadin Ltd * @since 7.0.0 */ -public class UsingXyzWhenInitializing extends Root { +public class UsingXyzWhenInitializing extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java index 0ed4a7781e..b5bf8538ed 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -14,7 +14,7 @@ import com.vaadin.ui.Root; * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class ComponentInStateRoot extends Root { +public class ComponentInStateRoot extends UI { @Override protected void init(WrappedRequest request) { ComponentInStateComponent component = new ComponentInStateComponent(); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java index ef692ef8a3..87aede8da9 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -33,7 +33,7 @@ import com.vaadin.ui.Root; * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class MyComponentRoot extends Root { +public class MyComponentRoot extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java index 69c2a0d040..04e2cf089e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java @@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Mini tutorial code for @@ -30,7 +30,7 @@ import com.vaadin.ui.Root; * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class ResourceInStateRoot extends Root { +public class ResourceInStateRoot extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java index fae4265750..38f008d8a0 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java @@ -10,10 +10,10 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class WidgetcontainerRoot extends Root { +public class WidgetcontainerRoot extends UI { @Override public void init(WrappedRequest request) { Label label = new Label("Hello Vaadin user"); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java index 6c247cae44..6f2be3c7d7 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.JavaScript; import com.vaadin.terminal.AbstractJavaScriptExtension; import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; @JavaScript("analytics_connector.js") public class Analytics extends AbstractJavaScriptExtension { @@ -38,12 +38,12 @@ public class Analytics extends AbstractJavaScriptExtension { callFunction("pushCommand", (Object) commandAndArguments); } - protected void extend(Root root) { - super.extend(root); + protected void extend(UI uI) { + super.extend(uI); } @Override protected Class<? extends ClientConnector> getSupportedParentType() { - return Root.class; + return UI.class; } } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java index df588b6f2d..05255d71cb 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java @@ -19,9 +19,9 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; -public class AnalyticsRoot extends Root { +public class AnalyticsRoot extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java index 9a477bf6dd..5b6a693389 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java @@ -25,7 +25,7 @@ import java.util.Map; import com.vaadin.annotations.JavaScript; import com.vaadin.shared.Connector; import com.vaadin.ui.AbstractJavaScriptComponent; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; @JavaScript("complex_types_connector.js") public class ComplexTypesComponent extends AbstractJavaScriptComponent { @@ -45,7 +45,7 @@ public class ComplexTypesComponent extends AbstractJavaScriptComponent { Map<Connector, String> connectorMap = new HashMap<Connector, String>(); connectorMap.put(this, "this"); - connectorMap.put(Root.getCurrent(), "root"); + connectorMap.put(UI.getCurrent(), "root"); boolean[] bits = { true, true, false, true }; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java index 5e19d8ab1a..ffe654d0b3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java @@ -17,9 +17,9 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; -public class ComplexTypesRoot extends Root { +public class ComplexTypesRoot extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java index f0584c2147..a8bf867fb5 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java @@ -19,9 +19,9 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; -public class FlotJavaScriptRoot extends Root { +public class FlotJavaScriptRoot extends UI { @Override protected void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java index 1bf30b0054..73fba3fd7e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java @@ -17,9 +17,9 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; -public class RedButtonRoot extends Root { +public class RedButtonRoot extends UI { @Override protected void init(WrappedRequest request) { addComponent(new RedButton("My red button")); diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java index a2d482dfbf..62160d233a 100644 --- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java @@ -10,13 +10,13 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Root; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI; +import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class ButtonsTest extends com.vaadin.Application.LegacyApplication { - final Root.LegacyWindow main = new LegacyWindow("Button states & themes"); + final UI.LegacyWindow main = new LegacyWindow("Button states & themes"); CheckBox styleToggle; CheckBox iconToggle; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java index 299c939043..8c99fe6ebb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java @@ -5,7 +5,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java index b1841b69ba..e11d6ea024 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; public class Ticket1230 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java index 8761db1cc3..4bcf31a366 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket124 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java index a5aa8cd2ac..6aa1c1752a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java index 7e9f5dab2c..c617b07248 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java @@ -4,7 +4,7 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1365 extends com.vaadin.Application.LegacyApplication diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java index 92d3598382..16b47a1f31 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; /** diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java index 3ba7ae2bfa..e162e96bfa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java @@ -10,7 +10,7 @@ import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java index d6d3b132c3..d46a56f73a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java index a597a5b242..1da3b5c290 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1444 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index 4b7d4201e0..3c766ef985 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1465ModalNotification extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java index 1c4156d7ff..8b1736637b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket1519 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java index 87ea7e86a8..a511bae6d9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java @@ -7,7 +7,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1572 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java index 6831d4c52d..5025605413 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1581 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java index 95cc918b6e..92a480c3d2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java @@ -17,7 +17,7 @@ import com.vaadin.terminal.RequestHandler; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.Link; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1589 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java index 5cb03e77af..05fd0c3f1f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java @@ -8,7 +8,7 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1598 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java index b8bf8deb20..4da1b3a6b4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java @@ -5,7 +5,7 @@ import com.vaadin.data.Container; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; /** diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java index 43feab5ab7..bca902a73f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; /** diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java index 3c64a49316..55d08069ed 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1659 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java index 64d53e33f6..b07e9df0e5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.terminal.SystemError; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1663 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java index 277096598e..99f213541a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1673 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java index 6547572e6d..d3c2437219 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java @@ -24,7 +24,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java index ccd649c542..364ad9b6cf 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java @@ -7,7 +7,7 @@ import com.vaadin.terminal.Resource; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1737 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java index bf57118a8c..eca0c0f833 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1767 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java index 2cbb648227..a269acc1e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1772 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java index 63af96b1a2..ec28a957bb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java @@ -4,7 +4,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1775 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java index 0a89675fc0..780215aa2a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java @@ -11,7 +11,7 @@ import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java index e5fcf59db8..7f5c684479 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1805 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java index fa572039aa..8359b024aa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1806 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java index 695be19300..824c58436f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java @@ -9,7 +9,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java index 42474d748d..e16b2c2774 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java @@ -8,7 +8,7 @@ import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index e31748ec2f..f7329037cc 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1834PanelScrolling extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java index 4b546de0f6..039f867fff 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java @@ -7,7 +7,7 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java index 1af0ed2041..8bd4a77204 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1868 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java index d51c0990ae..741adecae4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java @@ -4,7 +4,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1869 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java index 0a8992c17f..1b60d535cf 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java @@ -23,7 +23,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java index 9fe8ccd801..136af23474 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1900 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java index 2837d71e67..f35463f6a8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java @@ -5,7 +5,7 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1904 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java index 790d3aa931..3b50804938 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1916 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java index 75a2aafb96..8e9e0cb0ba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1919 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java index 416bb80875..3d79de5d1d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java @@ -10,7 +10,7 @@ import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1921 extends Application.LegacyApplication implements diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java index 17a7dacf26..2bde4c95ec 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1923 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java index 91ea8c0c44..b5d938dbed 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1925 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java index 48d8ff458c..f65fbf9852 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java index 10eebe4cba..1a27e1ad28 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java index a832401cd0..9bf4ddee51 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1953 extends Application.LegacyApplication { public static final String cellStyle = "test-cell"; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java index d461ffe4e3..9440855bbe 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java @@ -9,7 +9,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java index 85b802d46c..c5442e6473 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java @@ -9,7 +9,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966_2 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java index cfc9825b58..63634259a3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java @@ -6,7 +6,7 @@ import com.vaadin.terminal.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java index 2a29113829..b10ccea992 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java @@ -5,7 +5,7 @@ import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java index f9f098a05a..b07a997f8f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java @@ -7,7 +7,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1970 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java index fd77343259..6b406a2f89 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1972 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java index 24d11e6569..a3365bedcb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java @@ -4,7 +4,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java index 68307f7f99..4392c0762a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java @@ -5,7 +5,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java index e959098765..fda75a409e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1975 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java index fe0b636c56..a5953d22af 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java @@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket1982 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java index 4db82c3371..0d6a21faac 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java index 88ebad933f..fd6665b2fe 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java @@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.ListSelect; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.TwinColSelect; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java index 72866a3ee8..ed60c89c16 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket1991 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java index 2aaacef448..04ce9c712d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java @@ -7,7 +7,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.filter.SimpleStringFilter; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket1995 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java index 061fc0cf16..ea610a3db8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java @@ -8,7 +8,7 @@ import com.vaadin.data.validator.CompositeValidator.CombinationMode; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket20 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java index 8c7a7ba659..8ff3d952c4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2001 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java index 2c4a948cea..aeaf3bfb33 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2002 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java index e0b8635f32..0342b87e68 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2007 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java index 68cf5ef6d4..e79ec8905e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java index e8113b0cea..754036cd5b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; public class Ticket2011 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java index 8d9a5e67d4..bf909acb35 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2014 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java index f6d8ce5e01..c23f031a91 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java index bc97f906b1..ea142b7e9e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2022 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java index 427a55391b..c6b2c0f28a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java @@ -4,7 +4,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2023 extends com.vaadin.Application.LegacyApplication implements Button.ClickListener { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java index e7cabbca95..b1a8b64931 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java index 6d608ad529..0b72073bec 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2026 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java index 8acf4f1d16..ba8936adfa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java index c979898299..da47f796a5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java @@ -4,7 +4,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2037 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java index fa4cd76f47..c4714783a0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2038 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java index d98656b9ca..a7ca7b179f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Accordion; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java index d79f4a1bd6..49e999a601 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2042 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java index 7238462397..2efc66556d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Link; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2043 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java index 0b5a537b4d..110db06800 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java @@ -10,7 +10,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2048 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java index bd098443f2..1660f00d88 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java index fd64d6e35a..362a763c2f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java @@ -7,7 +7,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2053 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java index 88404b6ef1..c9e91930bf 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2060 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java index 1f633d7337..d86646b865 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java @@ -8,7 +8,7 @@ import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java index e3cd09926e..420d2b7086 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java index 082b956fe0..b0897600d3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java @@ -10,7 +10,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java index 5d91240c6a..9b2fe05514 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java index ea77b6f2e6..87bea00023 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2083 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java index 2042cf7cad..e48aae7d9f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java @@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2090 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java index a27ae7ac4d..258fad05c9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Embedded; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2095 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java index 5dc741eff6..a8a3e22d2b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket2098 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java index 0f0c00b05c..2bba0504a5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java index 67c3c9f331..c29eaaf453 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2101 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java index 1fb89eebc4..9017f66158 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java @@ -5,7 +5,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java index b8a6724a41..4da938351d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java @@ -11,7 +11,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; @@ -68,16 +68,16 @@ public class Ticket2104 extends Application.LegacyApplication { main.addComponent(tree); tree.setImmediate(true); tree.setNullSelectionAllowed(false); - tree.addItem("Root 1"); + tree.addItem("UI 1"); tree.addItem("1. Child 1"); - tree.setParent("1. Child 1", "Root 1"); + tree.setParent("1. Child 1", "UI 1"); tree.addItem("1. Child 2"); - tree.setParent("1. Child 2", "Root 1"); - tree.addItem("Root 2"); + tree.setParent("1. Child 2", "UI 1"); + tree.addItem("UI 2"); tree.addItem("2. Child 1"); - tree.setParent("2. Child 1", "Root 2"); + tree.setParent("2. Child 1", "UI 2"); tree.addItem("2. Child 2"); - tree.setParent("2. Child 2", "Root 2"); + tree.setParent("2. Child 2", "UI 2"); tree.addContainerProperty("icon", ExternalResource.class, new ExternalResource( "http://www.itmill.com/res/images/itmill_logo.gif")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java index 6edc625b39..9d6e198f03 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java @@ -6,7 +6,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2106 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java index 09ba9fac0b..37d570546b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java @@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2107 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java index 8bbfe0cd07..d5b5041060 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2117 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java index b563ec90ef..621b744aa8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java @@ -8,7 +8,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java index b12a865e80..bc1f886418 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java @@ -5,7 +5,7 @@ import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java index c9e070bef4..d49c73ea5f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java @@ -5,7 +5,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; /** diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java index c2fbe1b4f7..721bdf3c9f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java @@ -8,7 +8,7 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2151 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java index 23c5b0bcd5..b8f75fc279 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2157 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java index 6de42003b4..e64db69ced 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2178 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java index 31e1a9a0d6..622488dc0f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2179 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java index 7b993cdf24..fb9332d100 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket2180 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java index 44893eb531..ceba214dc5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java index b7817d2ed7..50b8a1f113 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java index 4caba62df2..24c4d6e8b9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java @@ -26,7 +26,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java index 3f0f35bb84..f622f093ee 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java index a387781ae3..ecad9a950a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2209 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java index 226df8b5e7..6eec0a7704 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2209OL extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java index 921f3b190b..7f4082d0f8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2209OL2 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java index 5b98fe3af3..f7099d88f4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java index 886aa376c3..e3f1516fb8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java index 51ac463a6e..14024fda8b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java @@ -5,7 +5,7 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2222 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java index e436bab283..f9c670708e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java @@ -5,7 +5,7 @@ import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java index ab0cc82628..21994bff60 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2231 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java index ae8a4b0f51..d71134696f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java @@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.SpacingHandler; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2232 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java index 24a6d2ea77..ccda59bb6a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2234 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java index 10978cad30..fba82956e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; public class Ticket2235 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java index c777d0772f..bb16a40cd7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2240 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java index 4b44ed1a87..77fbfefe1a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java @@ -10,7 +10,7 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket2242 extends Application.LegacyApplication implements diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java index a360760039..495e3de26a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Form; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2244 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java index 1586a1966b..ab474fe6f7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2245 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java index b5d6772e7f..41843a9742 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2267 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java index fb281f22b2..91fb51034b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2271 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java index c72b4e15ff..976b06fe32 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2282 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java index 8375ca648f..5576e48fba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2283 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java index 716c8af0db..59fc174215 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java @@ -4,7 +4,7 @@ import java.net.URL; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2287 extends Ticket2292 { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java index 0ad023450c..c715fafd74 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java index 35e9b8f2c5..e732ea09e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java @@ -19,7 +19,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.Link; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2292 extends com.vaadin.Application.LegacyApplication implements RequestHandler { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java index 30392a245d..053534191b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2294 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java index 31ff4a8353..d059b96953 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2296 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java index 1d1f0f1d74..073126ae07 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java @@ -6,7 +6,7 @@ import java.net.URL; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2297 extends Ticket2292 { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java index bc11a7ea49..fb1c5440ad 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java @@ -6,7 +6,7 @@ import java.io.IOException; import com.vaadin.Application; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2303 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java index b767b3661f..ccef7a9a92 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; public class Ticket2304 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java index 1cad5bde4f..24fbd7a968 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; public class Ticket2310 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java index ec6d3be801..438d2ff286 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java @@ -6,7 +6,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java index 123c154e61..d7b8db86bd 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket2323 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java index c253eb70e6..ecc897d4ba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java index f583a4af4b..2ce42376f9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java index f0cae1a59f..3ac381b2d1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2337 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java index 81dc3af40f..ce884bada7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java @@ -6,7 +6,7 @@ import java.io.IOException; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2339 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java index a35c27962f..aa2eefcb7e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.data.Item; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket2341 extends com.vaadin.Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java index d7b1eacd2c..befad78a73 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java @@ -4,7 +4,7 @@ import java.util.Random; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java index 5528dfebd6..582b9a95ee 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2347 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java index 8039609339..f7d6f61110 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Form; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java index 252406cc2d..b191901356 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2365 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java index 054cc5f0cc..f5b68800e6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket2398 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java index 0da70301d1..30f9d04d3b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2404 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java index c5ef9ec0b0..a76f3a711f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java @@ -9,7 +9,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java index 0036bdc7b2..dd42727591 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java index 51ab08188e..df2ae47acd 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Form; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java index 6801bfa88d..2c59493e0c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2411 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java index 509f4cf437..f52c1b1ccc 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2415 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java index adca729c9e..5d15107053 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2420 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java index 8c9be295a0..140fa6f2b6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket2425 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java index 40862e3ccd..fee74b73f7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2426 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java index f6e6c1e7b5..cb9eb449bf 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java @@ -7,7 +7,7 @@ import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2431 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java index 2716038873..f21e6a6752 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Layout.SpacingHandler; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2432 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java index 79e383393f..6401a98763 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; public class Ticket2434 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java index f48cf7a79a..5367c24b01 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket2436 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java index 97d096405e..998fe75f8c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket2526 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java index 1003ea1c66..733f6ac6f6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java @@ -6,7 +6,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; /** * @author Risto Yrjänä / Vaadin Ltd. diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java index ab808501f7..c4352abefe 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java index 2d2970d36e..0cd43533fd 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java @@ -23,7 +23,7 @@ import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.ListSelect; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java index b6e01d912f..7973ffa496 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java @@ -6,7 +6,7 @@ import java.util.HashSet; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java index e3b90c94b0..15d55ba643 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java index 35f244e07f..6f8ade15c4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; /** * #5053: Last ComboBox item may not be shown if null selection enabled diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java index 5902382d01..3102a0a56c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java @@ -5,7 +5,7 @@ import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; /** diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java index b7caa08b82..92cd0290d6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket5952 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java index fef7061516..887652aee7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java index ca55b8648c..1c66f67ca1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java @@ -17,7 +17,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java index c62cee038c..e539f999b3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java @@ -7,7 +7,7 @@ import java.io.ObjectOutputStream; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class Ticket695 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java index d871c8adc4..1176e87bb4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java @@ -15,7 +15,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; public class Ticket736 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java index 2f094f0bf8..24a98d42e3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java @@ -11,14 +11,14 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; import com.vaadin.ui.Table; /** * Test for #8291 and #7666: NegativeArraySizeException when Table scrolled to * the end and its size reduced. */ -public class Ticket8291 extends Root { +public class Ticket8291 extends UI { @Override public void init(WrappedRequest request) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java index 413d823d2d..407663c6c6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java @@ -5,7 +5,7 @@ import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket846 extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java index f72ff8beec..c12e2fcad3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java index 8f3f85a075..788415d0fd 100644 --- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java +++ b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java @@ -23,7 +23,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.SystemError; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** * Provides sample directory based on application directory. If this fails then @@ -41,7 +41,7 @@ public class SampleDirectory { * @param application * @return file pointing to sample directory */ - public static File getDirectory(Application application, Root root) { + public static File getDirectory(Application application, UI uI) { String errorMessage = "Access to application " + "context base directory failed, " + "possible security constraint with Application " @@ -79,9 +79,9 @@ public class SampleDirectory { "Cannot provide sample directory")); errorPanel.addComponent(new Label(errorMessage, ContentMode.XHTML)); // Remove all components from applications main window - root.getContent().removeAllComponents(); + uI.getContent().removeAllComponents(); // Add error panel - root.getContent().addComponent(errorPanel); + uI.getContent().addComponent(errorPanel); return null; } } diff --git a/tests/testbench/com/vaadin/tests/util/TestUtils.java b/tests/testbench/com/vaadin/tests/util/TestUtils.java index a9e1518c54..62f2cc0be3 100644 --- a/tests/testbench/com/vaadin/tests/util/TestUtils.java +++ b/tests/testbench/com/vaadin/tests/util/TestUtils.java @@ -2,7 +2,7 @@ package com.vaadin.tests.util; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class TestUtils { @@ -102,7 +102,7 @@ public class TestUtils { * * @param cssString */ - public static void injectCSS(Root w, String cssString) { + public static void injectCSS(UI w, String cssString) { String script = "if ('\\v'=='v') /* ie only */ {\n" + " document.createStyleSheet().cssText = '" + cssString diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java index 6c17c3005e..eefd37522b 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java +++ b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java @@ -29,7 +29,7 @@ public class BootstrapModifyRoot extends AbstractTestRoot { @Override protected String getTestDescription() { - return "There should be two additional divs in the HTML of the bootstrap page for this Root"; + return "There should be two additional divs in the HTML of the bootstrap page for this UI"; } @Override diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java index da058892b4..a525d3139b 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java +++ b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java @@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.server.BootstrapPageResponse; import com.vaadin.terminal.gwt.server.BootstrapResponse; import com.vaadin.terminal.gwt.server.AddonContextEvent; import com.vaadin.terminal.gwt.server.AddonContextListener; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; public class TestAddonContextListener implements AddonContextListener { @Override @@ -42,9 +42,9 @@ public class TestAddonContextListener implements AddonContextListener { } private boolean shouldModify(BootstrapResponse response) { - Root root = response.getRoot(); - boolean shouldModify = root != null - && root.getClass() == BootstrapModifyRoot.class; + UI uI = response.getRoot(); + boolean shouldModify = uI != null + && uI.getClass() == BootstrapModifyRoot.class; return shouldModify; } diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java index 7b03bc7ec2..b63527ad60 100644 --- a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java +++ b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java @@ -2,7 +2,7 @@ package com.vaadin.tests.validation; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Form; -import com.vaadin.ui.Root.LegacyWindow; +import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; |