Move LegacyWindow to its own file (#9917)

Change-Id: Iac2f000dfcc9dc8c52d45b83842dfa0d8382c1d5

server/src/com/vaadin/LegacyApplication.java

@@ -27,8 +27,8 @@ import com.vaadin.server.DefaultErrorListener;
 import com.vaadin.server.Terminal.ErrorEvent;
 import com.vaadin.server.Terminal.ErrorListener;
 import com.vaadin.server.VaadinServiceSession;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  * A special application designed to help migrating applications from Vaadin 6
@@ -43,10 +43,10 @@ import com.vaadin.ui.UI.LegacyWindow;
  */
 @Deprecated
 public abstract class LegacyApplication implements ErrorListener {
-    private UI.LegacyWindow mainWindow;
+    private LegacyWindow mainWindow;
     private String theme;
 
-    private Map<String, UI.LegacyWindow> legacyUINames = new HashMap<String, UI.LegacyWindow>();
+    private Map<String, LegacyWindow> legacyUINames = new HashMap<String, LegacyWindow>();
 
     private boolean isRunning = true;
 
@@ -64,7 +64,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * @param mainWindow
      *            the UI to set as the default window
      */
-    public void setMainWindow(UI.LegacyWindow mainWindow) {
+    public void setMainWindow(LegacyWindow mainWindow) {
         if (this.mainWindow != null) {
             throw new IllegalStateException("mainWindow has already been set");
         }
@@ -102,7 +102,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * 
      * @return the UI used as the default window
      */
-    public UI.LegacyWindow getMainWindow() {
+    public LegacyWindow getMainWindow() {
         return mainWindow;
     }
 
@@ -145,7 +145,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * @return a UI corresponding to the name, or <code>null</code> to use the
      *         default window
      */
-    public UI.LegacyWindow getWindow(String name) {
+    public LegacyWindow getWindow(String name) {
         return legacyUINames.get(name);
     }
 
@@ -165,7 +165,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * 
      * @see #addWindow(UI, String)
      */
-    public void addWindow(UI.LegacyWindow uI) {
+    public void addWindow(LegacyWindow uI) {
         if (uI.getName() == null) {
             String name = Integer.toString(namelessUIIndex++);
             uI.setName(name);
@@ -190,8 +190,8 @@ public abstract class LegacyApplication implements ErrorListener {
      * @param uI
      *            the UI to remove
      */
-    public void removeWindow(UI.LegacyWindow uI) {
-        for (Entry<String, UI.LegacyWindow> entry : legacyUINames.entrySet()) {
+    public void removeWindow(LegacyWindow uI) {
+        for (Entry<String, LegacyWindow> entry : legacyUINames.entrySet()) {
             if (entry.getValue() == uI) {
                 legacyUINames.remove(entry.getKey());
             }
@@ -207,7 +207,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * 
      * @return the unmodifiable collection of windows.
      */
-    public Collection<UI.LegacyWindow> getWindows() {
+    public Collection<LegacyWindow> getWindows() {
         return Collections.unmodifiableCollection(legacyUINames.values());
     }
 

server/src/com/vaadin/server/AbstractCommunicationManager.java

@@ -82,8 +82,8 @@ import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.HasComponents;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
 /**

server/src/com/vaadin/server/ClassResource.java

@@ -19,8 +19,8 @@ package com.vaadin.server;
 import java.io.Serializable;
 
 import com.vaadin.service.FileTypeResolver;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class

server/src/com/vaadin/server/LegacyApplicationUIProvider.java

@@ -22,6 +22,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.vaadin.LegacyApplication;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 
 /**
@@ -90,7 +91,7 @@ public abstract class LegacyApplicationUIProvider extends UIProvider {
         if (application == null) {
             return null;
         }
-        UI.LegacyWindow window = application.getWindow(name);
+        LegacyWindow window = application.getWindow(name);
         if (window != null) {
             return window;
         }

server/src/com/vaadin/server/Page.java

@@ -30,10 +30,10 @@ import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.PageClientRpc;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.ui.JavaScript;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.util.ReflectTools;
 
 public class Page implements Serializable {

server/src/com/vaadin/ui/LegacyWindow.java

@@ -0,0 +1,341 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+*/
+
+package com.vaadin.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import com.vaadin.LegacyApplication;
+import com.vaadin.server.Page;
+import com.vaadin.server.Resource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page.BrowserWindowResizeListener;
+import com.vaadin.shared.ui.BorderStyle;
+
+/**
+ * Helper class to emulate the main window from Vaadin 6 using UIs. This
+ * class should be used in the same way as Window used as a browser level
+ * window in Vaadin 6 with {@link com.vaadin.LegacyApplication}
+ */
+@Deprecated
+public class LegacyWindow extends UI {
+    private String name;
+    private LegacyApplication application;
+
+    /**
+     * Create a new legacy window
+     */
+    public LegacyWindow() {
+        super();
+    }
+
+    /**
+     * Creates a new legacy window with the given caption
+     * 
+     * @param caption
+     *            the caption of the window
+     */
+    public LegacyWindow(String caption) {
+        super();
+        setCaption(caption);
+    }
+
+    /**
+     * Creates a legacy window with the given caption and content layout
+     * 
+     * @param caption
+     * @param content
+     */
+    public LegacyWindow(String caption, ComponentContainer content) {
+        super(content);
+        setCaption(caption);
+    }
+
+    @Override
+    protected void init(VaadinRequest request) {
+        // Just empty
+    }
+
+    public void setApplication(LegacyApplication application) {
+        this.application = application;
+    }
+
+    public LegacyApplication getApplication() {
+        return application;
+    }
+
+    /**
+     * Gets the unique name of the window. The name of the window is used to
+     * uniquely identify it.
+     * <p>
+     * The name also determines the URL that can be used for direct access
+     * to a window. All windows can be accessed through
+     * {@code http://host:port/app/win} where {@code http://host:port/app}
+     * is the application URL (as returned by
+     * {@link LegacyApplication#getURL()} and {@code win} is the window
+     * name.
+     * </p>
+     * <p>
+     * Note! Portlets do not support direct window access through URLs.
+     * </p>
+     * 
+     * @return the Name of the Window.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the unique name of the window. The name of the window is used to
+     * uniquely identify it inside the application.
+     * <p>
+     * The name also determines the URL that can be used for direct access
+     * to a window. All windows can be accessed through
+     * {@code http://host:port/app/win} where {@code http://host:port/app}
+     * is the application URL (as returned by
+     * {@link LegacyApplication#getURL()} and {@code win} is the window
+     * name.
+     * </p>
+     * <p>
+     * This method can only be called before the window is added to an
+     * application.
+     * <p>
+     * Note! Portlets do not support direct window access through URLs.
+     * </p>
+     * 
+     * @param name
+     *            the new name for the window or null if the application
+     *            should automatically assign a name to it
+     * @throws IllegalStateException
+     *             if the window is attached to an application
+     */
+    public void setName(String name) {
+        this.name = name;
+        // The name can not be changed in application
+        if (getSession() != null) {
+            throw new IllegalStateException(
+                    "Window name can not be changed while "
+                            + "the window is in application");
+        }
+
+    }
+
+    /**
+     * Gets the full URL of the window. The returned URL is window specific
+     * and can be used to directly refer to the window.
+     * <p>
+     * Note! This method can not be used for portlets.
+     * </p>
+     * 
+     * @return the URL of the window or null if the window is not attached
+     *         to an application
+     */
+    public URL getURL() {
+        LegacyApplication application = getApplication();
+        if (application == null) {
+            return null;
+        }
+
+        try {
+            return new URL(application.getURL(), getName() + "/");
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(
+                    "Internal problem getting window URL, please report");
+        }
+    }
+
+    /**
+     * Opens the given resource in this UI. The contents of this UI is
+     * replaced by the {@code Resource}.
+     * 
+     * @param resource
+     *            the resource to show in this UI
+     * 
+     * @deprecated As of 7.0, use getPage().setLocation instead
+     */
+    @Deprecated
+    public void open(Resource resource) {
+        open(resource, null);
+    }
+
+    /* ********************************************************************* */
+
+    /**
+     * Opens the given resource in a window with the given name.
+     * <p>
+     * The supplied {@code windowName} is used as the target name in a
+     * window.open call in the client. This means that special values such
+     * as "_blank", "_self", "_top", "_parent" have special meaning. An
+     * empty or <code>null</code> window name is also a special case.
+     * </p>
+     * <p>
+     * "", null and "_self" as {@code windowName} all causes the resource to
+     * be opened in the current window, replacing any old contents. For
+     * downloadable content you should avoid "_self" as "_self" causes the
+     * client to skip rendering of any other changes as it considers them
+     * irrelevant (the page will be replaced by the resource). This can
+     * speed up the opening of a resource, but it might also put the client
+     * side into an inconsistent state if the window content is not
+     * completely replaced e.g., if the resource is downloaded instead of
+     * displayed in the browser.
+     * </p>
+     * <p>
+     * "_blank" as {@code windowName} causes the resource to always be
+     * opened in a new window or tab (depends on the browser and browser
+     * settings).
+     * </p>
+     * <p>
+     * "_top" and "_parent" as {@code windowName} works as specified by the
+     * HTML standard.
+     * </p>
+     * <p>
+     * Any other {@code windowName} will open the resource in a window with
+     * that name, either by opening a new window/tab in the browser or by
+     * replacing the contents of an existing window with that name.
+     * </p>
+     * <p>
+     * As of Vaadin 7.0.0, the functionality for opening a Resource in a
+     * Page has been replaced with similar methods based on a String URL.
+     * This is because the usage of Resource is problematic with memory
+     * management and with security features in some browsers. Is is
+     * recommended to instead use {@link Link} for starting downloads.
+     * </p>
+     * 
+     * @param resource
+     *            the resource.
+     * @param windowName
+     *            the name of the window.
+     * @deprecated As of 7.0, use getPage().open instead
+     */
+    @Deprecated
+    public void open(Resource resource, String windowName) {
+        open(resource, windowName, -1, -1, Page.BORDER_DEFAULT);
+    }
+
+    /**
+     * Opens the given resource in a window with the given size, border and
+     * name. For more information on the meaning of {@code windowName}, see
+     * {@link #open(Resource, String)}.
+     * <p>
+     * As of Vaadin 7.0.0, the functionality for opening a Resource in a
+     * Page has been replaced with similar methods based on a String URL.
+     * This is because the usage of Resource is problematic with memory
+     * management and with security features in some browsers. Is is
+     * recommended to instead use {@link Link} for starting downloads.
+     * </p>
+     * 
+     * @param resource
+     *            the resource.
+     * @param windowName
+     *            the name of the window.
+     * @param width
+     *            the width of the window in pixels
+     * @param height
+     *            the height of the window in pixels
+     * @param border
+     *            the border style of the window.
+     * @deprecated As of 7.0, use getPage().open instead
+     */
+    @Deprecated
+    public void open(Resource resource, String windowName, int width,
+            int height, BorderStyle border) {
+        getPage().open(resource, windowName, width, height, border);
+    }
+
+    /**
+     * Adds a new {@link BrowserWindowResizeListener} to this UI. The
+     * listener will be notified whenever the browser window within which
+     * this UI resides is resized.
+     * 
+     * @param resizeListener
+     *            the listener to add
+     * 
+     * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
+     * @see #setResizeLazy(boolean)
+     * 
+     * @deprecated As of 7.0, use the similarly named api in Page instead
+     */
+    @Deprecated
+    public void addListener(BrowserWindowResizeListener resizeListener) {
+        getPage().addListener(resizeListener);
+    }
+
+    /**
+     * Removes a {@link BrowserWindowResizeListener} from this UI. The
+     * listener will no longer be notified when the browser window is
+     * resized.
+     * 
+     * @param resizeListener
+     *            the listener to remove
+     * @deprecated As of 7.0, use the similarly named api in Page instead
+     */
+    @Deprecated
+    public void removeListener(BrowserWindowResizeListener resizeListener) {
+        getPage().removeListener(resizeListener);
+    }
+
+    /**
+     * Gets the last known height of the browser window in which this UI
+     * resides.
+     * 
+     * @return the browser window height in pixels
+     * @deprecated As of 7.0, use the similarly named api in Page instead
+     */
+    @Deprecated
+    public int getBrowserWindowHeight() {
+        return getPage().getBrowserWindowHeight();
+    }
+
+    /**
+     * Gets the last known width of the browser window in which this UI
+     * resides.
+     * 
+     * @return the browser window width in pixels
+     * 
+     * @deprecated As of 7.0, use the similarly named api in Page instead
+     */
+    @Deprecated
+    public int getBrowserWindowWidth() {
+        return getPage().getBrowserWindowWidth();
+    }
+
+    /**
+     * Executes JavaScript in this window.
+     * 
+     * <p>
+     * This method allows one to inject javascript from the server to
+     * client. A client implementation is not required to implement this
+     * functionality, but currently all web-based clients do implement this.
+     * </p>
+     * 
+     * <p>
+     * Executing javascript this way often leads to cross-browser
+     * compatibility issues and regressions that are hard to resolve. Use of
+     * this method should be avoided and instead it is recommended to create
+     * new widgets with GWT. For more info on creating own, reusable
+     * client-side widgets in Java, read the corresponding chapter in Book
+     * of Vaadin.
+     * </p>
+     * 
+     * @param script
+     *            JavaScript snippet that will be executed.
+     * 
+     * @deprecated as of 7.0, use JavaScript.getCurrent().execute(String)
+     *             instead
+     */
+    @Deprecated
+    public void executeJavaScript(String script) {
+        getPage().getJavaScript().execute(script);
+    }
+
+    @Override
+    public void setCaption(String caption) {
+        // Override to provide backwards compatibility
+        getState().caption = caption;
+        getPage().setTitle(caption);
+    }
+
+}

server/src/com/vaadin/ui/UI.java

@@ -17,8 +17,6 @@
 package com.vaadin.ui;
 
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +25,6 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
@@ -36,11 +33,8 @@ import com.vaadin.event.MouseEvents.ClickListener;
 import com.vaadin.navigator.Navigator;
 import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.Page;
-import com.vaadin.server.Page.BrowserWindowResizeEvent;
-import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.server.Resource;
 import com.vaadin.server.UIProvider;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
@@ -48,7 +42,6 @@ import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIServerRpc;
 import com.vaadin.shared.ui.ui.UIState;
@@ -90,331 +83,6 @@ import com.vaadin.util.ReflectTools;
 public abstract class UI extends AbstractComponentContainer implements
         Action.Container, Action.Notifier, LegacyComponent {
 
-    /**
-     * Helper class to emulate the main window from Vaadin 6 using UIs. This
-     * class should be used in the same way as Window used as a browser level
-     * window in Vaadin 6 with {@link com.vaadin.LegacyApplication}
-     */
-    @Deprecated
-    public static class LegacyWindow extends UI {
-        private String name;
-        private LegacyApplication application;
-
-        /**
-         * Create a new legacy window
-         */
-        public LegacyWindow() {
-            super();
-        }
-
-        /**
-         * Creates a new legacy window with the given caption
-         * 
-         * @param caption
-         *            the caption of the window
-         */
-        public LegacyWindow(String caption) {
-            super();
-            setCaption(caption);
-        }
-
-        /**
-         * Creates a legacy window with the given caption and content layout
-         * 
-         * @param caption
-         * @param content
-         */
-        public LegacyWindow(String caption, ComponentContainer content) {
-            super(content);
-            setCaption(caption);
-        }
-
-        @Override
-        protected void init(VaadinRequest request) {
-            // Just empty
-        }
-
-        public void setApplication(LegacyApplication application) {
-            this.application = application;
-        }
-
-        public LegacyApplication getApplication() {
-            return application;
-        }
-
-        /**
-         * Gets the unique name of the window. The name of the window is used to
-         * uniquely identify it.
-         * <p>
-         * The name also determines the URL that can be used for direct access
-         * to a window. All windows can be accessed through
-         * {@code http://host:port/app/win} where {@code http://host:port/app}
-         * is the application URL (as returned by
-         * {@link LegacyApplication#getURL()} and {@code win} is the window
-         * name.
-         * </p>
-         * <p>
-         * Note! Portlets do not support direct window access through URLs.
-         * </p>
-         * 
-         * @return the Name of the Window.
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Sets the unique name of the window. The name of the window is used to
-         * uniquely identify it inside the application.
-         * <p>
-         * The name also determines the URL that can be used for direct access
-         * to a window. All windows can be accessed through
-         * {@code http://host:port/app/win} where {@code http://host:port/app}
-         * is the application URL (as returned by
-         * {@link LegacyApplication#getURL()} and {@code win} is the window
-         * name.
-         * </p>
-         * <p>
-         * This method can only be called before the window is added to an
-         * application.
-         * <p>
-         * Note! Portlets do not support direct window access through URLs.
-         * </p>
-         * 
-         * @param name
-         *            the new name for the window or null if the application
-         *            should automatically assign a name to it
-         * @throws IllegalStateException
-         *             if the window is attached to an application
-         */
-        public void setName(String name) {
-            this.name = name;
-            // The name can not be changed in application
-            if (getSession() != null) {
-                throw new IllegalStateException(
-                        "Window name can not be changed while "
-                                + "the window is in application");
-            }
-
-        }
-
-        /**
-         * Gets the full URL of the window. The returned URL is window specific
-         * and can be used to directly refer to the window.
-         * <p>
-         * Note! This method can not be used for portlets.
-         * </p>
-         * 
-         * @return the URL of the window or null if the window is not attached
-         *         to an application
-         */
-        public URL getURL() {
-            LegacyApplication application = getApplication();
-            if (application == null) {
-                return null;
-            }
-
-            try {
-                return new URL(application.getURL(), getName() + "/");
-            } catch (MalformedURLException e) {
-                throw new RuntimeException(
-                        "Internal problem getting window URL, please report");
-            }
-        }
-
-        /**
-         * Opens the given resource in this UI. The contents of this UI is
-         * replaced by the {@code Resource}.
-         * 
-         * @param resource
-         *            the resource to show in this UI
-         * 
-         * @deprecated As of 7.0, use getPage().setLocation instead
-         */
-        @Deprecated
-        public void open(Resource resource) {
-            open(resource, null);
-        }
-
-        /* ********************************************************************* */
-
-        /**
-         * Opens the given resource in a window with the given name.
-         * <p>
-         * The supplied {@code windowName} is used as the target name in a
-         * window.open call in the client. This means that special values such
-         * as "_blank", "_self", "_top", "_parent" have special meaning. An
-         * empty or <code>null</code> window name is also a special case.
-         * </p>
-         * <p>
-         * "", null and "_self" as {@code windowName} all causes the resource to
-         * be opened in the current window, replacing any old contents. For
-         * downloadable content you should avoid "_self" as "_self" causes the
-         * client to skip rendering of any other changes as it considers them
-         * irrelevant (the page will be replaced by the resource). This can
-         * speed up the opening of a resource, but it might also put the client
-         * side into an inconsistent state if the window content is not
-         * completely replaced e.g., if the resource is downloaded instead of
-         * displayed in the browser.
-         * </p>
-         * <p>
-         * "_blank" as {@code windowName} causes the resource to always be
-         * opened in a new window or tab (depends on the browser and browser
-         * settings).
-         * </p>
-         * <p>
-         * "_top" and "_parent" as {@code windowName} works as specified by the
-         * HTML standard.
-         * </p>
-         * <p>
-         * Any other {@code windowName} will open the resource in a window with
-         * that name, either by opening a new window/tab in the browser or by
-         * replacing the contents of an existing window with that name.
-         * </p>
-         * <p>
-         * As of Vaadin 7.0.0, the functionality for opening a Resource in a
-         * Page has been replaced with similar methods based on a String URL.
-         * This is because the usage of Resource is problematic with memory
-         * management and with security features in some browsers. Is is
-         * recommended to instead use {@link Link} for starting downloads.
-         * </p>
-         * 
-         * @param resource
-         *            the resource.
-         * @param windowName
-         *            the name of the window.
-         * @deprecated As of 7.0, use getPage().open instead
-         */
-        @Deprecated
-        public void open(Resource resource, String windowName) {
-            open(resource, windowName, -1, -1, Page.BORDER_DEFAULT);
-        }
-
-        /**
-         * Opens the given resource in a window with the given size, border and
-         * name. For more information on the meaning of {@code windowName}, see
-         * {@link #open(Resource, String)}.
-         * <p>
-         * As of Vaadin 7.0.0, the functionality for opening a Resource in a
-         * Page has been replaced with similar methods based on a String URL.
-         * This is because the usage of Resource is problematic with memory
-         * management and with security features in some browsers. Is is
-         * recommended to instead use {@link Link} for starting downloads.
-         * </p>
-         * 
-         * @param resource
-         *            the resource.
-         * @param windowName
-         *            the name of the window.
-         * @param width
-         *            the width of the window in pixels
-         * @param height
-         *            the height of the window in pixels
-         * @param border
-         *            the border style of the window.
-         * @deprecated As of 7.0, use getPage().open instead
-         */
-        @Deprecated
-        public void open(Resource resource, String windowName, int width,
-                int height, BorderStyle border) {
-            getPage().open(resource, windowName, width, height, border);
-        }
-
-        /**
-         * Adds a new {@link BrowserWindowResizeListener} to this UI. The
-         * listener will be notified whenever the browser window within which
-         * this UI resides is resized.
-         * 
-         * @param resizeListener
-         *            the listener to add
-         * 
-         * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
-         * @see #setResizeLazy(boolean)
-         * 
-         * @deprecated As of 7.0, use the similarly named api in Page instead
-         */
-        @Deprecated
-        public void addListener(BrowserWindowResizeListener resizeListener) {
-            getPage().addListener(resizeListener);
-        }
-
-        /**
-         * Removes a {@link BrowserWindowResizeListener} from this UI. The
-         * listener will no longer be notified when the browser window is
-         * resized.
-         * 
-         * @param resizeListener
-         *            the listener to remove
-         * @deprecated As of 7.0, use the similarly named api in Page instead
-         */
-        @Deprecated
-        public void removeListener(BrowserWindowResizeListener resizeListener) {
-            getPage().removeListener(resizeListener);
-        }
-
-        /**
-         * Gets the last known height of the browser window in which this UI
-         * resides.
-         * 
-         * @return the browser window height in pixels
-         * @deprecated As of 7.0, use the similarly named api in Page instead
-         */
-        @Deprecated
-        public int getBrowserWindowHeight() {
-            return getPage().getBrowserWindowHeight();
-        }
-
-        /**
-         * Gets the last known width of the browser window in which this UI
-         * resides.
-         * 
-         * @return the browser window width in pixels
-         * 
-         * @deprecated As of 7.0, use the similarly named api in Page instead
-         */
-        @Deprecated
-        public int getBrowserWindowWidth() {
-            return getPage().getBrowserWindowWidth();
-        }
-
-        /**
-         * Executes JavaScript in this window.
-         * 
-         * <p>
-         * This method allows one to inject javascript from the server to
-         * client. A client implementation is not required to implement this
-         * functionality, but currently all web-based clients do implement this.
-         * </p>
-         * 
-         * <p>
-         * Executing javascript this way often leads to cross-browser
-         * compatibility issues and regressions that are hard to resolve. Use of
-         * this method should be avoided and instead it is recommended to create
-         * new widgets with GWT. For more info on creating own, reusable
-         * client-side widgets in Java, read the corresponding chapter in Book
-         * of Vaadin.
-         * </p>
-         * 
-         * @param script
-         *            JavaScript snippet that will be executed.
-         * 
-         * @deprecated as of 7.0, use JavaScript.getCurrent().execute(String)
-         *             instead
-         */
-        @Deprecated
-        public void executeJavaScript(String script) {
-            getPage().getJavaScript().execute(script);
-        }
-
-        @Override
-        public void setCaption(String caption) {
-            // Override to provide backwards compatibility
-            getState().caption = caption;
-            getPage().setTitle(caption);
-        }
-
-    }
-
     /**
      * Event fired when a UI is removed from the application.
      */

server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java

@@ -8,8 +8,8 @@ import org.junit.Test;
 
 import com.vaadin.LegacyApplication;
 import com.vaadin.server.VaadinServiceSession;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
 public class AddRemoveSubWindow {

server/tests/src/com/vaadin/tests/server/components/TestWindow.java

@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
 
-import com.vaadin.ui.UI.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;

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 {

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

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;
 
 /**

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,

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;
 
 /**

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 {

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;
 
 /**

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;
 
 /**

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;

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;
 
 /**

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;
 

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 {

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;

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;

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 {
 

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 {

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 {

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

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;
 
 /**

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 {

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 {
 

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 {
 

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 {

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

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 {
 

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 {

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 {
 

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

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;
 

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")

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);
 

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;
 

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 {
 

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 {

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 {
 

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 {

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 {

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 {

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();

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;
 

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 {

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 {

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 {
 

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 {

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 {

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 {

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 {
 

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

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 {

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 {

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 {

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 {

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 {

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 {
 

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);

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 {
 

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;

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;
 

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 {
 

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 {

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());

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

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 {
 

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 {
 

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;
 

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;

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;
 
 /**

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 {

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 {

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

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 {
 

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 {

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 {

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

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;
 

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;

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;
 

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 {
 

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 {
 

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;
 

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 {
 

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;
 
 /**
  */

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 {
 

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 {

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {