diff options
Diffstat (limited to 'uitest')
253 files changed, 258 insertions, 258 deletions
diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java index 97a1479df3..788c67571f 100644 --- a/uitest/src/com/vaadin/tests/Components.java +++ b/uitest/src/com/vaadin/tests/Components.java @@ -26,9 +26,9 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ItemStyleGenerator; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Components extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java index 73ac9c60c0..61d636099f 100644 --- a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java @@ -24,11 +24,11 @@ import com.vaadin.ui.Component.Listener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Field; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.PasswordField; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; /** * This example demonstrates custom layout. All components created here are diff --git a/uitest/src/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java index 275ccf4d5d..fbd6fd0821 100644 --- a/uitest/src/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/com/vaadin/tests/LayoutDemo.java @@ -24,9 +24,9 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/ListenerOrder.java b/uitest/src/com/vaadin/tests/ListenerOrder.java index 1fb195c88a..39bc25ab29 100644 --- a/uitest/src/com/vaadin/tests/ListenerOrder.java +++ b/uitest/src/com/vaadin/tests/ListenerOrder.java @@ -13,8 +13,8 @@ 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.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; public class ListenerOrder extends com.vaadin.LegacyApplication implements Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener, diff --git a/uitest/src/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java index 174fbd64da..74c408aa87 100644 --- a/uitest/src/com/vaadin/tests/ModalWindow.java +++ b/uitest/src/com/vaadin/tests/ModalWindow.java @@ -20,8 +20,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; /** diff --git a/uitest/src/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java index 63084301e7..833e7b3ab5 100644 --- a/uitest/src/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; public class NativeWindowing extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java index dd7f6a1a7e..dd2a2a3759 100644 --- a/uitest/src/com/vaadin/tests/Parameters.java +++ b/uitest/src/com/vaadin/tests/Parameters.java @@ -28,10 +28,10 @@ import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/com/vaadin/tests/RandomLayoutStress.java index cda69a0707..db46f49904 100644 --- a/uitest/src/com/vaadin/tests/RandomLayoutStress.java +++ b/uitest/src/com/vaadin/tests/RandomLayoutStress.java @@ -27,12 +27,12 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.Select; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java index 29cf4d06a6..f06e91f177 100644 --- a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java +++ b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java @@ -8,11 +8,11 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java index 5a76a7259c..fac98b3b8b 100644 --- a/uitest/src/com/vaadin/tests/TestBench.java +++ b/uitest/src/com/vaadin/tests/TestBench.java @@ -35,10 +35,10 @@ import com.vaadin.ui.CustomComponent; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index 35dfa89338..7436658ef4 100644 --- a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -19,8 +19,8 @@ package com.vaadin.tests; import com.vaadin.LegacyApplication; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java index 01bc0e0152..6ddce101d8 100644 --- a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; public class TestForNativeWindowing extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java index aac2d933e1..6442895d87 100644 --- a/uitest/src/com/vaadin/tests/TestForStyledUpload.java +++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java @@ -33,10 +33,10 @@ 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.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.ProgressIndicator; -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/uitest/src/com/vaadin/tests/TestForUpload.java b/uitest/src/com/vaadin/tests/TestForUpload.java index 31298aa392..a78e86a85e 100644 --- a/uitest/src/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/com/vaadin/tests/TestForUpload.java @@ -38,12 +38,12 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.Select; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.FinishedEvent; import com.vaadin.ui.Upload.StartedEvent; diff --git a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java index e7bb9a64b4..c9ada7300d 100644 --- a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -20,8 +20,8 @@ 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.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class TestSetVisibleAndCaching extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java index 732895cddf..ce720c27dc 100644 --- a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java +++ b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java @@ -37,9 +37,9 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TestSizeableIncomponents extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/TestSplitPanel.java b/uitest/src/com/vaadin/tests/TestSplitPanel.java index cb03e50a2f..83ab607f85 100644 --- a/uitest/src/com/vaadin/tests/TestSplitPanel.java +++ b/uitest/src/com/vaadin/tests/TestSplitPanel.java @@ -17,7 +17,7 @@ package com.vaadin.tests; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalSplitPanel; public class TestSplitPanel extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java index 230d9441ad..8b85c98f6f 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java @@ -23,10 +23,10 @@ import com.vaadin.server.VaadinServiceSession; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ExpandEvent; -import com.vaadin.ui.UI.LegacyWindow; /** * Browsable file explorer using Vaadin Tree component. Demonstrates: how to add diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java index 546262fbd9..c8c880a725 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java @@ -26,9 +26,9 @@ import com.vaadin.ui.Component.Event; import com.vaadin.ui.Component.Listener; import com.vaadin.ui.Field; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java index c2fc4936d4..cc3f020e06 100644 --- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java @@ -23,9 +23,9 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; public class UsingObjectsInSelect extends com.vaadin.LegacyApplication implements ValueChangeListener { diff --git a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java index 19b872cb2f..827be38e79 100644 --- a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java +++ b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java @@ -11,9 +11,9 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class GAESyncTest extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java index 151b58ed67..f1548ea6c2 100644 --- a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java @@ -5,7 +5,7 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class ApplicationCloseTest extends TestBase { diff --git a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java index 1278032f3c..a5a7e3f274 100644 --- a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java +++ b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java @@ -9,9 +9,9 @@ import com.vaadin.ui.Component; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.PasswordField; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class ErrorInUnloadEvent extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java index a043da7774..ac4e421fdc 100644 --- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java @@ -10,8 +10,8 @@ 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.LegacyWindow; import com.vaadin.ui.UI; -import com.vaadin.ui.UI.LegacyWindow; public class ThreadLocalInstances extends AbstractTestCase { private static final VaadinServiceSession staticInitApplication = VaadinServiceSession diff --git a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java index fa0f13e172..c59039e81b 100644 --- a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class ChangeSessionId extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java index 3260c52003..08e39f7e6f 100644 --- a/uitest/src/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public abstract class TestBase extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java index 75707a7d79..3473f50ee5 100644 --- a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -21,6 +21,7 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; public class AllComponentTooltipTest extends AbstractTestUI { diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java index e93529fad4..49a4d258bd 100644 --- a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -5,8 +5,8 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class EnableState extends AbstractTestCase { @Override diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java index 3a0afdce50..47f6795e0e 100644 --- a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index 6b9b05e4ac..1041b1f656 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -8,7 +8,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") diff --git a/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java index c93da483ab..410b5c17ad 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java +++ b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java @@ -5,14 +5,14 @@ import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.UI; +import com.vaadin.ui.LegacyWindow; @SuppressWarnings("serial") public class GridLayoutComboBoxZoomOut extends AbstractTestCase { @Override public void init() { - UI.LegacyWindow mainWindow = new UI.LegacyWindow( + LegacyWindow mainWindow = new LegacyWindow( "Gridlayoutbug Application"); setMainWindow(mainWindow); diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 4cf7b98679..173f1596a7 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java index 56265203a1..1baea1b793 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java @@ -8,7 +8,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Alignment; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class DateFieldPopupOffScreen extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java index 3aacb9e199..ec8630879a 100644 --- a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java +++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java @@ -5,8 +5,8 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class UndefinedWideFormWithRelativeWideFooter extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java index aa2d371671..ce405a8eff 100644 --- a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java +++ b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.FormLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class TableInFormLayoutCausesScrolling extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index e469d13e07..40e0bfad81 100644 --- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.loginform; import com.vaadin.LegacyApplication; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.LoginForm; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; -import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class LoginFormWithMultipleWindows extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java index 5a59aa6187..624c6ee732 100644 --- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.menubar; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.MenuBar; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class MenuBarInSplitPanel extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java index c88edf5bdc..78c6d92ee2 100644 --- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Alignment; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class MenuBarRunsOutOfBrowser extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java index 0f4140e903..5c3c6fcdc8 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; @@ -14,7 +14,7 @@ public class LayoutRenderTimeTest extends LegacyApplication { @Override public void init() { - UI.LegacyWindow main = new UI.LegacyWindow(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); VerticalLayout root = new VerticalLayout(); diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index 60d20ad8be..f558285224 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -4,8 +4,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index 342cd9de6c..7328983f21 100644 --- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.UI.LegacyWindow; public class SplitPanelExtraScrollbars extends AbstractTestCase implements ClickListener { diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java index 5043af10ac..bba2feeabe 100644 --- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java +++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java @@ -4,9 +4,9 @@ import com.vaadin.server.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeButton; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class SplitPanelWidthOnResize extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java index 1ef30ff6b0..007f3bbc2b 100644 --- a/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java +++ b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class ScrollCausesRequestLoop extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java index 65e60a05a1..edad05e191 100644 --- a/uitest/src/com/vaadin/tests/components/table/SortLongTable.java +++ b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.AbstractTestCase; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class SortLongTable extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java index 76e05c51d0..fa10ab344c 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java +++ b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java @@ -4,8 +4,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TableExtraScrollbars extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java index f937ba6ed5..1ce29b9f20 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java +++ b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java @@ -4,9 +4,9 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Container; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TableFirstRowFlicker extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java index ef26f73f92..95952cb8e7 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java +++ b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CssLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class TableHeaderZoom extends TestBase { diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 2ed9ed4599..055820210a 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -4,8 +4,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; /** * Setting table height and setting column header mode as hidden leaves the body diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java index 7df73a6b4c..22cdf7f312 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -7,8 +7,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TableToggleVisibility extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index eb47003d03..0aa10662fa 100644 --- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -5,9 +5,9 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TabsheetNPE extends AbstractTestCase implements ClickListener { diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java index 0662e23239..9e4cbace32 100644 --- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java +++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.textfield; import com.vaadin.LegacyApplication; import com.vaadin.ui.Component; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TextFieldInLayoutInTable extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java index 529a0238c6..45084fd57d 100644 --- a/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java +++ b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TreePerformanceTest extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java index 737712dd52..2311f3ec30 100644 --- a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java +++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TreeScrolling extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java index d06dd1ec0a..aaa7496616 100644 --- a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.AbstractTestCase; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.TreeTable; -import com.vaadin.ui.UI.LegacyWindow; public class DisappearingComponents extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index 686daca27e..9994414d12 100644 --- a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -10,7 +10,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.UI; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; public class AttachShouldBeCalledForSubWindows extends AbstractTestCase { @@ -30,7 +30,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase { addSubWindowBeforeMainWindow = true; } - UI.LegacyWindow mainWindow = new UI.LegacyWindow() { + LegacyWindow mainWindow = new LegacyWindow() { @Override public void attach() { log(this); diff --git a/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java index 92e0e734ff..4beec68085 100644 --- a/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -3,8 +3,8 @@ 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.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class ExecuteJavaScript extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java index 481862cbea..8ccd389b1a 100644 --- a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; diff --git a/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index c1e9367dc7..c9b0d725bf 100644 --- a/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -7,9 +7,9 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java index 2d2e9eec48..81996635af 100644 --- a/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -3,8 +3,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class WindowScrollingUp extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index a93b4fe311..8144939d1a 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -12,8 +12,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class CheckboxUpdateProblem extends LegacyApplication implements Property.ValueChangeListener { diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java index 737563f975..ee96e8f9f5 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java @@ -3,7 +3,7 @@ package com.vaadin.tests.containers.sqlcontainer; import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.UI; +import com.vaadin.ui.LegacyWindow; /** * See http://dev.vaadin.com/ticket/9155 . @@ -13,7 +13,7 @@ public class ComboBoxUpdateProblem extends LegacyApplication { @Override public void init() { - setMainWindow(new UI.LegacyWindow("Test window")); + setMainWindow(new LegacyWindow("Test window")); ComboBox combo = new ComboBox("Names", databaseHelper.getTestContainer()); diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index f3bd903686..8c3ca52427 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -11,8 +11,8 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; // author table in testdb (MySQL) is set out as follows diff --git a/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java index 7afdf906b5..77c0723cdd 100644 --- a/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java +++ b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java @@ -7,7 +7,7 @@ import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class EmbedSizeTest extends TestBase { diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java index 916af7129e..37c13b1892 100644 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -7,8 +7,8 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.server.ClassResource; import com.vaadin.server.Resource; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class IntegrationTestApplication extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java index f3c7f009c8..9e2294285b 100644 --- a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -26,11 +26,11 @@ import com.vaadin.server.VaadinPortletSession.PortletListener; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; diff --git a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java index 5b0195f202..c0846eade0 100644 --- a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -31,6 +31,7 @@ import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ListSelect; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; @@ -50,7 +51,6 @@ import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.TwinColSelect; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java index 897649fcc2..74e0de1af4 100644 --- a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java +++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java @@ -2,7 +2,7 @@ package com.vaadin.tests.integration; import com.vaadin.LegacyApplication; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index 3a22a46e68..4fa93e27b9 100644 --- a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -4,8 +4,8 @@ import com.vaadin.server.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java index 4e6a4fb02a..923f91f246 100644 --- a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -15,8 +15,8 @@ import com.vaadin.ui.Form; import com.vaadin.ui.FormFieldFactory; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class GridLayoutCaptions extends TestBase { diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 47c445bb86..4bf33903a1 100644 --- a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -6,8 +6,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class GridLayoutExpandRatioModification extends TestBase implements diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java index df34dc2f66..a1552a61a6 100644 --- a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java +++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class GridLayoutInsidePanel2 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java index 359e77197f..c29e7710b7 100644 --- a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -12,9 +12,9 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TestLayoutClickListeners extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java index a5c392765b..257e0174d5 100644 --- a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java +++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java @@ -2,8 +2,8 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class TreeWithBordersInLayout extends AbstractTestCase { diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 48c0222337..bc7268356d 100644 --- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class VerticalLayoutExpandRatioModification extends TestBase implements diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index e31ecc2498..2294b1909b 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -10,8 +10,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; diff --git a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java index 443a5dacf8..d713f45a07 100644 --- a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java +++ b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java @@ -9,14 +9,13 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.UI; -import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") public class ButtonsTest extends com.vaadin.LegacyApplication { - final UI.LegacyWindow main = new LegacyWindow("Button states & themes"); + final LegacyWindow main = new LegacyWindow("Button states & themes"); CheckBox styleToggle; CheckBox iconToggle; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java index 1e8b4bfea8..4241b53178 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java @@ -5,9 +5,9 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java index a988fe3822..27d51f663a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java @@ -6,8 +6,8 @@ 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.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1230 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java index 42c50c6d7e..d9b3586c00 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket124 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java index 4b7c5705ac..9adb43dbb8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java @@ -5,9 +5,9 @@ import com.vaadin.data.Property; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java index d269c9184f..1d65141834 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java @@ -4,8 +4,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1365 extends com.vaadin.LegacyApplication implements Handler { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java index 1caa275e10..e4a1767a96 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.ComboBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; /** */ diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java index a29525556c..5516f9c3b0 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java @@ -8,11 +8,11 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1397 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java index 9ac0c122f3..e84ce5652b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java @@ -11,9 +11,9 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.MarginHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1435 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java index e2632f3bb6..ac7e332ca4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1444 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index e57eb0962a..0cbe4855cf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Notification; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1465ModalNotification extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java index 58dd3653a2..aa792d3dd7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.CustomLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1519 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java index c4eeefe049..4b9a0709f4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java @@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1572 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java index a29fba9bff..2f9481992b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java @@ -6,8 +6,8 @@ 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.LegacyWindow; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1581 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java index 8bc1e749a6..facf3c6133 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java @@ -17,8 +17,8 @@ import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinServiceSession; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1589 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java index cbb1f88043..fb041d1996 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.LegacyApplication; import com.vaadin.server.ThemeResource; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1598 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java index 2e00bd3ff0..1149b19867 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket161.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; /** */ diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java index bb0aaea607..88bf1f9f62 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; /** */ diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java index a587aa5a94..edaaddc499 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1659 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java index 024ae3acb5..27c61eba49 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.server.SystemError; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1663 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java index eb739ebafb..543719c132 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java @@ -4,7 +4,7 @@ import com.vaadin.server.CustomizedSystemMessages; import com.vaadin.server.SystemMessages; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1673 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java index e53dcf3b84..f0eb56910b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java @@ -22,10 +22,10 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1710 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java index 4384215943..80a0072231 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java @@ -6,8 +6,8 @@ import com.vaadin.server.DownloadStream; import com.vaadin.server.Resource; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1737 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java index f3925122e5..08cc595572 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1767 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java index 5307963596..eb584adfb8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java @@ -3,8 +3,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1772 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java index 3524ad8c54..f0bfff7133 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1775 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java index f9ab7eabba..e20e0e1ec5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java @@ -11,8 +11,8 @@ 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.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1804 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java index 7c053cad12..b8165fe195 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1805 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java index b7443abd6c..aad81bbe6a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java @@ -3,8 +3,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1806 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java index e334d8c959..b244d55b06 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java @@ -9,8 +9,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1811 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java index 909d91807b..c9bd0404d0 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java @@ -8,8 +8,8 @@ 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.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1819 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index e604482a5d..aed5fc8a7e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -5,8 +5,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1834PanelScrolling extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java index 0008156819..b18da069b3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1857 extends LegacyApplication implements Handler { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java index 2149cdc0a6..010e090a2d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1868 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java index a8fb5dbdb8..54d95a14cb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1869 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java index f240151e0a..649a510ef2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java @@ -22,9 +22,9 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1878 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java index b1395b4602..59d433af28 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1900 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java index ee6a9fe638..30ce5a0fc6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1904 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java index ad388ec665..0827768539 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1916 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java index d7c647c731..e372bd0a02 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java @@ -4,8 +4,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1919 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java index 5fe63591ff..e94bf25108 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java @@ -11,7 +11,7 @@ import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1921 extends LegacyApplication implements RequestHandler { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java index a53247e876..3d4b995741 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1923 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java index ccf21c7206..770c350933 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1925 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java index cbb76e49e4..e43f15121a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1939 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java index dcc1d9669a..3c229d7bb4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1940 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java index 3824f1f662..8f4e25f19c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1953 extends LegacyApplication { public static final String cellStyle = "test-cell"; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java index 461923da9c..0f0ddf9331 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java @@ -8,8 +8,8 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java index 8a5641d05c..4f5d738aad 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java @@ -8,8 +8,8 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966_2 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java index e0bd063d6a..eb3f078569 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java @@ -5,9 +5,9 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966_3 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java index 3b525d470c..c1ecc0610a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java @@ -5,9 +5,9 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1969 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java index d3209f4442..6b1cb4ee83 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1970 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java index 2d73edf487..90cc834ebf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1972 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java index 6b95bb4fbf..e03f01fc93 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java @@ -4,8 +4,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1973 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java index 2678574249..6651b43f92 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1973_2 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java index f41585ff5d..10942d308e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1975 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java index 55e95f0eb3..5d6a692075 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket1982 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java index 18f257effe..d8076e1f8e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java @@ -9,8 +9,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java index 1920a146ef..9c9a0c2adf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java @@ -5,12 +5,12 @@ import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ListSelect; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; import com.vaadin.ui.TwinColSelect; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1986 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java index af2c9ca982..375427a50f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1991 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java index d765efe003..28d99cbfde 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket1995 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java index 80416155c3..030b94bf79 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket20.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java @@ -8,8 +8,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket20 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java index 41496754bf..fd9acc9ae1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2001 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java index 5faa586151..1385873cc9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2002 extends LegacyApplication { private Long long1 = new Long(1L); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java index d97444d5c7..93edc6a94d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2007 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java index 64429ed75b..559112cdb4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java @@ -7,11 +7,11 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java index 0149084f0c..a272040435 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2011 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java index 1398feca2b..1b0b595335 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java @@ -8,8 +8,8 @@ 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.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2014 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java index d6d8a359cd..137c33beb2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java @@ -10,9 +10,9 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.MarginHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextArea; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2021 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java index a5737a0fbf..ccfb79d980 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2022 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java index 9570f19091..5699b4e6a4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2023 extends com.vaadin.LegacyApplication implements Button.ClickListener { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java index 538aa4d6df..7150b1810f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2024 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java index 55da756322..f511bc71c7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2026 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java index 912b141dc3..b4e6644c91 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java @@ -10,10 +10,10 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2029 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java index 68c977b84b..a2ef63bfec 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2037 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java index a05e53427f..ff009c3e57 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java @@ -4,9 +4,9 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2038 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java index 5134f5ff52..a999b96bec 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java @@ -3,9 +3,9 @@ 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.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2040 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java index c96dd52183..029a9d6c69 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java @@ -6,8 +6,8 @@ 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.LegacyWindow; import com.vaadin.ui.Notification; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2042 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java index 834301fb1c..ddfaa315c8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.BorderStyle; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2043 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java index 05ca9c4526..d56f427f7b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java @@ -9,8 +9,8 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2048 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java index 012d74ef93..75b0dae036 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java @@ -7,9 +7,9 @@ import com.vaadin.ui.Component; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2051 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java index 437a4c48b5..0bde0074a9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java @@ -7,8 +7,8 @@ import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2053 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java index a461264237..0fdbc039ed 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2060 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java index 5e2596f816..0c861879f6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java @@ -8,9 +8,9 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2061 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java index 71ac3a0064..7727dff814 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java @@ -11,13 +11,13 @@ import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java index f0f8868e2f..0173de050f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java @@ -9,12 +9,12 @@ import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2061c extends LegacyApplication implements diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java index 021ed83972..ae3a08ff70 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.HorizontalSplitPanel; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2062 extends LegacyApplication { private static final Object P1 = new Object(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java index 061fb47f76..901ca31325 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2083 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java index ef9bb9c5f9..fb01bf23de 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java @@ -6,8 +6,8 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2090 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java index 701c306c19..4c15a5aa9b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Embedded; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2095 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java index 66f222a3db..24619a090e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2098 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java index 1163a8e87a..48ead759ac 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java @@ -6,8 +6,8 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java index c4c6b7320d..62c11e6509 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2101 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java index 7f01f43aa3..a42075b1e2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2103 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java index b6a87552b7..17b3e9732c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java @@ -11,9 +11,9 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2104 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java index 569d4fe30f..395f8da7e7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java @@ -8,7 +8,7 @@ import com.vaadin.server.SystemMessages; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2106 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java index 94652ab4a8..9f36347a99 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java @@ -5,9 +5,9 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2107 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java index 53231dd9bc..5218f12f6c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2117 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java index 76c429ec11..229ad53857 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java @@ -8,8 +8,8 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; /** diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java index 5101b6d46b..b55fdff513 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java @@ -5,10 +5,10 @@ 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.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2125 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java index 20a97a3be9..acdf04c0d5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; /** * diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java index 1606218b88..50285ce7ca 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2151 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java index bbd4dcf192..e41b8a9ad2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2157 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java index 897ffaaf1b..b0989aa6d3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2178 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java index d27c1f6c6b..ac9f5f6df7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2179 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java index dfbd30bdab..86bcf31df5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2180 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java index ae758884b1..faa84dcd46 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java @@ -11,9 +11,9 @@ import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2181 extends LegacyApplication implements diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java index 5aa2e6208d..7e09fb7eba 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java @@ -3,9 +3,9 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2186 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java index c32627b464..db13cffbd2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java @@ -24,10 +24,10 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java index c517e50070..86e0a9d665 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java @@ -4,10 +4,10 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2208 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java index 6dc1e7bd71..bb388a072c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2209 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java index 55b7a17c89..c2df9e16bf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2209OL extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java index 9615b6f249..9fda647752 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2209OL2 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java index 6dfcf9d344..57063f4666 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java index 858e852b1e..2323f4d514 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java @@ -8,9 +8,9 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2221 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java index e46477e4de..390b856bed 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2222 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java index 7b0de4cbfa..18ecd1262c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java @@ -5,8 +5,8 @@ import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2227OrderedlayoutInTable extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java index 935c34fec2..50a60050e5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2231 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java index 4aa1b948a5..d806bf0046 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2232 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java index dcc3f90696..c1a52eb00d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.data.Item; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2234 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java index afb47199bb..3144ba3a6c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextArea; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2235 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java index 6fc36fbdf0..226a725e7f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2240 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java index 0b9185c379..c51785d043 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java @@ -10,8 +10,8 @@ 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.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2242 extends LegacyApplication implements ValueChangeListener { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java index 5b46e0332d..e6087009bc 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2244 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java index 09d2e7a678..1fb95df0a5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2245 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java index 1a8e743f42..701c38e6aa 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2267 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java index 71f47be1b3..08c1461ab3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2271 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java index 8f6da9ffc5..7de2416374 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2282 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java index daac9ae704..a9abb5377f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2283 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java index 211811a460..ef32f70de4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2287 extends Ticket2292 { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java index fcd1c2a578..68e29df55d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java @@ -7,8 +7,8 @@ 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.LegacyWindow; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2289 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java index 38cd84ff01..20376a9df6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java @@ -18,8 +18,8 @@ import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2292 extends com.vaadin.LegacyApplication implements RequestHandler { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java index cfa5ecdd61..5a5f3ca36a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2294 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java index 2a19899425..5905164982 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2296 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/com/vaadin/tests/tickets/Ticket2297.java index 073126ae07..eb8f47fde3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2297.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2297 extends Ticket2292 { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java index dd6a3886ac..2b844302c8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java @@ -6,7 +6,7 @@ import java.io.IOException; import com.vaadin.LegacyApplication; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2303 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java index 84321b88f3..069b58fd88 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; public class Ticket2304 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java index 99d10ff36d..4cfe6244e2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java @@ -4,8 +4,8 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; public class Ticket2310 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java index dd0a54dc63..f060f44fe2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java @@ -5,8 +5,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java index eba7f2b06d..768eb9e0fe 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class Ticket2323 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java index 0277831f41..826956049a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextArea; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java index d2e5e39abd..8ce9b65e6b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java @@ -3,9 +3,9 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Component; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2329 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java index b2ad360bf8..64b0c260b5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2337 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java index e1eb9ed5c4..884e8e895a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java @@ -6,7 +6,7 @@ import java.io.IOException; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2339 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java index f01c211629..e062a8ee50 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.data.Item; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2341 extends com.vaadin.LegacyApplication { @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java index a00c00685e..967a9fb8b3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java @@ -4,8 +4,8 @@ import java.util.Random; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java index 393aebf2ad..feea712798 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2347 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java index 81ee50cdcb..070095c379 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Form; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Select; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2364 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java index 8361b0b308..508a03c98a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2365 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java index aa8b58d017..15ae20ab87 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2398 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java index b26cfc027a..4418cd00ec 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2404 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java index d89a877d92..d02e84ad1d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java @@ -9,8 +9,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2405 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java index a6ef9be77a..c464019432 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java @@ -4,7 +4,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java index 012d0aa67a..9c8e106727 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Form; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2407 extends com.vaadin.LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java index b9784d6941..177f62857a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2411 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java index 028e8203f8..051dc6696a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2415 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java index d1ecfab9be..5bf7f6c0bc 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2420 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java index 7c0e43520f..040e807fb0 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java @@ -2,9 +2,9 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2425 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java index 4d76e04e05..f39209f58f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2426 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java index 5db59ab45c..5654a062dd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2431 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java index 4a1dfb33bb..ea1f42b373 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java +++ b/uitest/src/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.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket2432 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java index ad1df9c57d..a4507113f3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2434 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java index 1445095b1e..1df3363dbf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Component; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.PopupView; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket2436 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java index f340dd7e80..c2a27df491 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; public class Ticket2526 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java index 6e9dea0363..5333bf8bfa 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java @@ -5,8 +5,8 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.UI.LegacyWindow; /** * @author Risto Yrjänä / Vaadin Ltd. diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java index 23f875a747..db0c8d5ae2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java index ab263e54ea..0e4ccb1176 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java @@ -20,12 +20,12 @@ import com.vaadin.ui.Field; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.MarginHandler; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ListSelect; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.ui.themes.Reindeer; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java index a5db5b6ace..e6e318de37 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java @@ -6,9 +6,9 @@ import java.util.HashSet; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket3146 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java index 85c39c6842..08dd2ea450 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket34.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java @@ -10,9 +10,9 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket34 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java index b055e63789..b84bad2bdd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; /** * #5053: Last ComboBox item may not be shown if null selection enabled diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java index bf38a5b9b1..d32ddac7ad 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java @@ -4,9 +4,9 @@ import com.vaadin.LegacyApplication; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; /** * Key codes were converted to lower case on the server (overlapping special key diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java index c240d94f0c..a22abdae86 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.LegacyApplication; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; public class Ticket5952 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java index 0d5ee43d41..abb72e158c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket6002.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket6002 extends TestBase { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java index 1f72291c4a..3d04d2b8e1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket677.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java @@ -16,10 +16,10 @@ import com.vaadin.ui.Form; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket677 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java index d5f3d74ef0..4aa9cb501b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket695.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java @@ -7,7 +7,7 @@ import java.io.ObjectOutputStream; import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UI.LegacyWindow; +import com.vaadin.ui.LegacyWindow; @SuppressWarnings("serial") public class Ticket695 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java index 865c5483dc..b1a3a3fdd8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket736.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java @@ -14,8 +14,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket736 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java index 33b64961cf..1bd1ea7193 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket846.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java @@ -5,8 +5,8 @@ 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.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket846 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java index 66b5ba5cf5..8e89a3fe44 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket932.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java @@ -4,9 +4,9 @@ import com.vaadin.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; public class Ticket932 extends LegacyApplication { diff --git a/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java index f60156281b..dca6130217 100644 --- a/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java +++ b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java @@ -2,8 +2,8 @@ package com.vaadin.tests.validation; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Form; +import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.TextField; -import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class RequiredErrorMessage extends AbstractTestCase { |