Move LegacyWindow to its own file (#9917)

Change-Id: Iac2f000dfcc9dc8c52d45b83842dfa0d8382c1d5

diff --git a/server/src/com/vaadin/LegacyApplication.java b/server/src/com/vaadin/LegacyApplication.java
index 8526bc331025e0d09e1c8bc4111c02b2c5bb3c0a..c28482e2a58154498a24cb3c9869ec1449a715bb 100644 (file)
--- a/server/src/com/vaadin/LegacyApplication.java
+++ b/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());
     }
 

diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index c3a62132656075d559f2109e93d6c421aec191c6..a294d67a3183cd89f31901e87a17f4f717b49896 100644 (file)
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/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;
 
 /**

diff --git a/server/src/com/vaadin/server/ClassResource.java b/server/src/com/vaadin/server/ClassResource.java
index a5b654ea6193a26aba0fd35098a237d3e7b9fd18..29bb0d2a7516077626f67a1eb7f0b57e38712b80 100644 (file)
--- a/server/src/com/vaadin/server/ClassResource.java
+++ b/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

diff --git a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
index bedab3210574ce14fe04ed0b858b97407655a621..e2a58ba1bc9ef8136614c452d5ec2d3a13ded3ac 100644 (file)
--- a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/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;
         }

diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index ab8c591b133c388cc76b81da63c3c2db4f567f2f..2fed002ce6daeb3479f412f6c6cef4c85d48a00e 100644 (file)
--- a/server/src/com/vaadin/server/Page.java
+++ b/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 {

diff --git a/server/src/com/vaadin/ui/LegacyWindow.java b/server/src/com/vaadin/ui/LegacyWindow.java
new file mode 100644 (file)
index 0000000..572d3f8
--- /dev/null
+++ b/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);
+    }
+
+}
\ No newline at end of file

diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index d57d38b371ef0a0b7631effb0d406c354b8d8be0..fb6ab9a0e1232e189caa69babc6108c254ed0415 100644 (file)
--- a/server/src/com/vaadin/ui/UI.java
+++ b/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.
      */

diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index 8aac9a9598980cf1b551ee4f28bfb07943cf8398..0ba1ce0859ac9aa28537e9ee0c607215b211a5ac 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/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 {

diff --git a/server/tests/src/com/vaadin/tests/server/components/TestWindow.java b/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
index 12d3a3c8f520dddaf2265e3967d5420c0779838c..6707965be6aae2bb9d044c33a61af1523cef0e6a 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
+++ b/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;

diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java
index 97a1479df39023f7a5ca89a9dfd2b46476f086cd..788c67571f7794fa3dddb5653616b69f4e15dcff 100644 (file)
--- 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 73ac9c60c0c58cd389956341fd4909d005ea285a..61d636099ff5e5d6d801c8754723b42023ca0bde 100644 (file)
--- 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 275ccf4d5d3fa5dbc123ace722d7d0a32f14cb8a..fbd6fd08214294dfff9cfd87ec76e4dce9025219 100644 (file)
--- 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 1fb195c88ad1e8c701916fba62daa2b8fb2a74b3..39bc25ab29c89659a9e3a103a1f5dc80fa7a0e65 100644 (file)
--- 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 174fbd64da641c7c1e642d7c799b24cef7dcb153..74c408aa879b75ad68d677fe8c0d19d71eaa840e 100644 (file)
--- 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 63084301e7269cc1d517be40fac5cd398f1e74a2..833e7b3ab5829e0e468e462f45d4ab3262adcf03 100644 (file)
--- 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 dd7f6a1a7e5326724912e6984ae733c6a3138451..dd2a2a3759b0ce0da4b3bbbd65e032c1dbf0fc06 100644 (file)
--- 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 cda69a070718b7787c9360f9c1011d1b0a236d10..db46f49904b3a518445207f67db85fbad50e9e58 100644 (file)
--- 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 29cf4d06a62ec2da2f05b278ae0827f02c99455d..f06e91f177385dd675cd9cd3a2739c29947162e7 100644 (file)
--- 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 5a76a7259c614412b11e925cb09878d5ed154aab..fac98b3b8ba418abd83afc14af607bf3f41d094c 100644 (file)
--- 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 35dfa8933822cb05ff83d3e8d919faa11760a922..7436658ef43668b778b55a70da26b79cd7cce92b 100644 (file)
--- 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 01bc0e01522988277c713ca2dacba6f5e53ab822..6ddce101d89f840da9f7cca43ab8a461a17d805a 100644 (file)
--- 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 aac2d933e1a7bb8aae51f6669d9ac92ce7bae393..6442895d87361f402606111ad4af2afd1722df3a 100644 (file)
--- 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 31298aa39275f11b305c90856b283370dd677b90..a78e86a85e29c5c89d22818e5bf205a8e5be5702 100644 (file)
--- 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 e7bb9a64b48a3b26144123d613fdbd173228865b..c9ada7300d65a2f5167847f96cb530f22e511621 100644 (file)
--- 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 732895cddf975a843cfa6131157e0fa3c75850bc..ce720c27dcdd990bb22b68dc16d2ec35cfd1e2c4 100644 (file)
--- 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 cb03e50a2fb975afcdf682c0462f28438ba0174b..83ab607f85680d368b6f2ffda342211003225c61 100644 (file)
--- 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 230d9441adf69c36c31733cfc6e9b9b70a24a672..8b85c98f6f48c4adf0972a5c1b58361c675889fb 100644 (file)
--- 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 546262fbd97c0c97ff8432f7fc1060622c8b1736..c8c880a72555a9ebe54cd4b476639fc7a7d9c1f5 100644 (file)
--- 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 c2fc4936d480f4ef9e1ef3855aa75ca49a30a5ec..cc3f020e06790a5d64869a9b9e7c1447d0354706 100644 (file)
--- 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 19b872cb2fbf6212a33b0b10f3b413a2d19abe17..827be38e794cc601ba3f04abbd62632d79b30053 100644 (file)
--- 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 151b58ed677554442c70ace60ee3a0aa3f5e3219..f1548ea6c2831817af84c98c97f20e6eb18785a3 100644 (file)
--- 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 1278032f3caec0b28ba2b451d4517f5ea6a08e12..a5a7e3f2744c978a19a6645311be63a174215f1b 100644 (file)
--- 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 a043da777466b3ec8aaa4c0cfe5a7397721e0c73..ac4e421fdce389dec43cdf61d15d35065ac1b4e3 100644 (file)
--- 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 fa0f13e1725e5ab8a70020ada3d7c62a47a4d959..c59039e81b441983e99702c967600e863c5d0edb 100644 (file)
--- 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 3260c52003856ca661562181c1500ce558a5f0f4..08e39f7e6f36238662e5453f1ed6dd77ba856ba1 100644 (file)
--- 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 75707a7d7989b4b524440b0d384a49e63089359d..3473f50ee531fc3af0f598670564452119359d65 100644 (file)
--- 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 e93529fad4f252fde55b2f76fa4ae8a91112b044..49a4d258bdff5cd21f27b1d7e5f4e466bce3ecdc 100644 (file)
--- 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 3a0afdce5023317dd6b4f206b170e79fdbdca5b2..47f6795e0e0c0e5f257e9021b9ad8567421168a3 100644 (file)
--- 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 6b9b05e4ac6e5643ed9431c6667efc85e126bf23..1041b1f65680fe9ebdb43d89e7d7e91651a27eed 100644 (file)
--- 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 c93da483ab228ed2a081cf84f13450bdc30c7937..410b5c17ada4df5c7b5c3dbd1e3dd91d56c6e982 100644 (file)
--- 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 4cf7b98679325cee9ff419ac7cc4ea1568d8469b..173f1596a700e0cad8a6fe040427bc30c4d5e7aa 100644 (file)
--- 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 56265203a12a61d2787167e08c63bc632e0dbbbb..1baea1b793588ff3f7f06b3bcd48dad203c67f4b 100644 (file)
--- 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 3aacb9e199579cc094888c17b40452ff689b4d02..ec8630879a83fac498bc29171d78056e534a68b2 100644 (file)
--- 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 aa2d371671aa1851cc518e982c9366326036dfa7..ce405a8efff3f8cab5c0f36874d9f9d324c6d5ed 100644 (file)
--- 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 e469d13e07768771b8e73f554c212b51c4c9f80e..40e0bfad81d28c793af706502ad5d4df4d636343 100644 (file)
--- 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 5a59aa6187ce35976441684fc27cc66737e01342..624c6ee732569ab1081ae37e5291e397a11599fa 100644 (file)
--- 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 c88edf5bdc1549e4e477073e293ecd77deeb8df6..78c6d92ee2764327f9c2d195549454510128941a 100644 (file)
--- 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 0f4140e90369da725b04d44e88571728fa057a4e..5c3c6fcdc82161142a46cf254538d7a6463e6c59 100644 (file)
--- 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 60d20ad8be96540c584f3a3381c0a471a50cd321..f558285224a8d6b991dd83f41e16b458eac9317f 100644 (file)
--- 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 342cd9de6c3eb7a5523018711357fb407e9cd86e..7328983f212754fccee0d892ad37c4e907cace13 100644 (file)
--- 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 5043af10ac4221a717fbbbc4994483299dc0ffbb..bba2feeabe0a76ccdc06175f160aa635b2d1a8d8 100644 (file)
--- 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 1ef30ff6b05b0d509dbcd404921f09abe9e7251a..007f3bbc2b3752d03be1b2e0114fa5b6eddd7308 100644 (file)
--- 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 65e60a05a1f9589db9c3f2e9a0357e8a1d274f1e..edad05e1913542040ead4757ad8e171824f5f099 100644 (file)
--- 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 76e05c51d0e660d81b16e0c5e5f0e70e525c0868..fa10ab344ce8993515bae6f87298159797391645 100644 (file)
--- 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 f937ba6ed563ff91dbcea8e29b6309fdec65321a..1ce29b9f20d847e4a2a38848cded030d5db875ba 100644 (file)
--- 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 ef26f73f92ee4cce8313ba83c3a9eca0f43c94da..95952cb8e76daf1e9a2c333542adeb1c1217f817 100644 (file)
--- 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 2ed9ed4599954fa0b1d9b8980d60fa735cd3c457..055820210a3e1d1c373a46c4ddcbc08ac4167bde 100644 (file)
--- 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 7df73a6b4c2105d8ad6bb3b71324c9cc1a063ea5..22cdf7f312e6805c48c71fc195d09441944440fd 100644 (file)
--- 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 eb47003d03a97ebce142d0cb997fa865321e4b1a..0aa10662fac4ca987406a985e6b6989e296fe089 100644 (file)
--- 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 0662e23239f591ffc75ea3b51b9f4a1a69be8172..9e4cbace32d8b3b4aee266e793350028e7a5e0a1 100644 (file)
--- 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 529a0238c6386cc970cebfdc2c19094e15e03b42..45084fd57d9bb21dd9fc250975f185cbfe3510d6 100644 (file)
--- 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 737712dd5277663015415c738ae77edc3f223ae2..2311f3ec30764c09ebaad1197dc1a050963274fd 100644 (file)
--- 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 d06dd1ec0adb012c196195e0723b518dc5d6bbc3..aaa7496616182b92c3150a2877680dba7b784d5e 100644 (file)
--- 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 686daca27e1c066a14f59b7181ab63e78b8c6fc1..9994414d124d6c1a7285a33a4b1259a3e33939bd 100644 (file)
--- 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 92e0e734ff7723269cc00a1866008f086750167d..4beec6808511faaf44b6b7429b8c4b6856b088eb 100644 (file)
--- 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 481862cbeaadcd154a9e33eb9b137a133b09f18d..8ccd389b1a27c5c784537775672646e329d1b7b8 100644 (file)
--- 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 c1e9367dc7830f3f12533828181e4cc2bb34c5b8..c9b0d725bf41e51e34b62a8121a35d76ba2cda3d 100644 (file)
--- 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 2d2e9eec48d96e30f863cc3c17d0cd755426c836..81996635af06f1ce12cb34c5c37bbe582df084a7 100644 (file)
--- 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 a93b4fe3114f8120db25c3c657f6b06ca8e39a50..8144939d1ab0c9f7f027a8d3a4d88b8a4743ad21 100644 (file)
--- 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 737563f975179f901eeed99e042d3e332917c08f..ee96e8f9f58acce580d701f0e9d2370b276adc0c 100644 (file)
--- 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 f3bd90368664fbaf835c085a92334b7b8b6259eb..8c3ca52427187be279318248e5e5f044f38fdbfc 100644 (file)
--- 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 7afdf906b5c3ef3374f460713e3a4b990f0d3990..77c0723cdd10aea67a8bfe5b21966ae8e9eb073a 100644 (file)
--- 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 916af7129e30a3c74793866a99c9e73e693b1e2b..37c13b1892ca92185ce5318cfe032bf5656a0e86 100644 (file)
--- 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 f3c7f009c81b540633cd8f833b7dbb6a55defd93..9e2294285b666785e16d938002b0deb3cec80417 100644 (file)
--- 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 5b0195f2026406802825b93a2efb98932987aada..c0846eade070fc56eaf3be732a78caecfd641176 100644 (file)
--- 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 897649fcc23df9a020567cd9f504369a868aa227..74e0de1af46bc5fb918d60af910df0d00d540622 100644 (file)
--- 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 3a22a46e6896adfb944829211ff8e40a3367adfd..4fa93e27b9a78ad3d4c60164740cd20e319ea200 100644 (file)
--- 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 4e6a4fb02a1a6580da976a63565f9f292b2879c9..923f91f246599928ed1abd7a15a21a44af608b09 100644 (file)
--- 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 47c445bb8609da9627a45ed034df6b9d4734e2a8..4bf33903a11d19ddb6cfd952fe5d0edfaa19fb3e 100644 (file)
--- 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 df34dc2f66fec2b5742e1fbab5909e81f08e7ad2..a1552a61a6363136ad9abe99f9eea5c895523581 100644 (file)
--- 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 359e77197fc273a66edce003a66eaca342d01b6d..c29e7710b78b3ab76538d62975579a57c6dda15c 100644 (file)
--- 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 a5c392765bd7b476c52e951aec9be9842658b172..257e0174d515a8d567af4b8c37987d283a53396a 100644 (file)
--- 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 48c022233766afd58f19743dc4393b016cee02cd..bc7268356dba579f8ed41fb5109682c92c1be026 100644 (file)
--- 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 e31ecc2498eb9ad3c6843b5dff579d5b8daa4a2e..2294b1909b706ad4edd2908e3fdd563c5b96a50d 100644 (file)
--- 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 443a5dacf885c74a4854b27a9ea1b759dcb2afe7..d713f45a0735376609c5b71b4d63af0f3ee69c37 100644 (file)
--- 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 1e8b4bfea8dab6433e9207fcceb4ded66d2be52a..4241b531787370571c9085d5f7e4bdb1bb341938 100644 (file)
--- 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 a988fe38226b0ee3ec3bea0804801c979186db9d..27d51f663ab6294cf5ee69ebed635765e98a9669 100644 (file)
--- 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 42c50c6d7e7006e5793ca10fad6b8f2a7882e936..d9b3586c00594cf5598131bcea400a54b79a6c9f 100644 (file)
--- 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 4b7c5705ac597351402d4fe3de4af806f4cd89ec..9adb43dbb85a331a4ec2c2ba8f4752086e04d731 100644 (file)
--- 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 d269c9184fc349cced6a732b04f27e129581ff4e..1d65141834fc0960ed807a35307f55bc16fa3d75 100644 (file)
--- 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 1caa275e10e756d1ca52b53717fd3bc06260fa60..e4a1767a96b10549176f60de0672f574dd70bcf9 100644 (file)
--- 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 a29525556c660a0115890c595641b43cb3d56701..5516f9c3b08bf0cab421c40e61906cca8b34641a 100644 (file)
--- 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 9ac0c122f36beeaa69edb59b7dfb7f2557c75fb4..e84ce5652baa5b03da2f28ef5aaf0975cdfafe95 100644 (file)
--- 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 e2632f3bb613820bfb9e7d4b335616fe7cd61a49..ac7e332ca4a6196d03b1d4aafbb19ba22ddb9fcf 100644 (file)
--- 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 e57eb0962a48b1b32434c87f415a0a1d8769160b..0cbe4855cf950c6453386a2b8f2dfb1d9cfc624b 100644 (file)
--- 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 58dd3653a25f126f9f966289fc7a0af19df4c8a0..aa792d3dd7ac0bcd0522778383c8946fe6dc5dcd 100644 (file)
--- 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 c4eeefe049eb3fbfbb5ec35e475e24c6800c6dab..4b9a0709f49d98edd4b39c46e090a66f23575488 100644 (file)
--- 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 a29fba9bffec20cf2cfcd96253c493c0e69695e9..2f9481992b13da415a88cf7955f1a77cea8d3ab3 100644 (file)
--- 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 8bc1e749a6e9518ed3bbdff3478c253f2b84e574..facf3c6133ad59ab8380ab9a37dd3af8b127b84d 100644 (file)
--- 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 cbb1f880435f2cb95d48dad75421e212bb135e0b..fb041d19960860e02ec42038d41a722ed8e9290a 100644 (file)
--- 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 2e00bd3ff08871bfce5217d6fb480390c62d7d1a..1149b19867f6fe3003668234429f0d5a42025cd0 100644 (file)
--- 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 bb0aaea607e0c5c0281440929621a5554a6decd9..88bf1f9f62a644b7899b726071439f84d9089c06 100644 (file)
--- 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 a587aa5a9489611a034b2b5ab9a5233b5304c6f2..edaaddc4999e39019f6469d4e8a601b8df0a8261 100644 (file)
--- 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 024ae3acb5f24d6f1cb168c3968e1af34d8c39fb..27c61eba49d1da93bafc3c28981d829514796795 100644 (file)
--- 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 eb739ebafb17158bd4dcb8afcf10c610ab68bfc4..543719c13237681427edbce4ca3957f2c238fb11 100644 (file)
--- 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 e53dcf3b8425d58ac078432cef5ac9e60172bc83..f0eb56910b5a727138256880d85634db4a2a12f1 100644 (file)
--- 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 43842159439fe3ad9435378389deec1081e81a76..80a00722313895a1f90fa7447ca70771a3c34c99 100644 (file)
--- 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 f3925122e5624395169e55dbf689aba711d89867..08cc595572684a23870602c49abc679d8f8a84ed 100644 (file)
--- 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 5307963596fac08601c6d21a388f89870648e45d..eb584adfb8ad2eec222b87795f6095887fcf84af 100644 (file)
--- 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 3524ad8c541ab6f9c1be960f4e4bc855453783cc..f0bfff71330e79e0e07c0817f8204de39e4e7427 100644 (file)
--- 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 f9ab7eabba9bcb0f02abefdd7d482de1cd245b0f..e20e0e1ec50888b1cf92e48fddc6bbd246f2fdac 100644 (file)
--- 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 7c053cad121b84eded9cd515089d39aea2d8e519..b8165fe19504317758187a072274306053bdd378 100644 (file)
--- 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 b7443abd6c0961e80aa522782a52f324d30d14bc..aad81bbe6a21391e2bcd9410acd7a7e39f24c759 100644 (file)
--- 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 e334d8c9595ace6fc3661c85d16d8eef6496195f..b244d55b068cb9bbd1769fa631507290a150f5d5 100644 (file)
--- 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 909d91807b2776c993e681ae36797700d328b2da..c9bd0404d04123fae28898f05d84bc672b78da82 100644 (file)
--- 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 e604482a5d0a4e065103e21dedab3a50805cba2f..aed5fc8a7ebd8a294f5228d9ae8a33b9bf1ef485 100644 (file)
--- 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 000815681934af3d8da8aa36e8e328b9c351cd84..b18da069b34f998cf9b3a923c373c2ea6353df1d 100644 (file)
--- 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 2149cdc0a6a3b6410d506f5ef9f5896015d5728b..010e090a2d4e4ab20da0a67364f93e879b545ee4 100644 (file)
--- 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 a8fb5dbdb8900c42dc24c8ceb223879c572489f1..54d95a14cb391d2a3e291c1b2e258546e0eddb80 100644 (file)
--- 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 f240151e0acc0f43dfbdc3cb22d43a414f9b3dbc..649a510ef24e2c9c153a85bfc7742bd2387cd3ce 100644 (file)
--- 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 b1395b46020b3496da1e72b3c23dcee720a80ba0..59d433af28c5465f1d09b807fcaa6ebd054431f1 100644 (file)
--- 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 ee6a9fe63857c1bbccc9d51d7f5ee6fd9c8c6c26..30ce5a0fc6498791eb70a1c1ac523f2a1b756eaf 100644 (file)
--- 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 ad388ec665f343807624092cc9e5a70f454b7c6c..0827768539525ff99f2b94df088c42c329b13ee3 100644 (file)
--- 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 d7c647c731b6c33b726447e9e6f1463a1b9a4943..e372bd0a02a546c9d604ceedf7b4dda10bb6a020 100644 (file)
--- 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 5fe63591ff0fbe97fdff7d061d445d7e8194af2c..e94bf25108cc2b0fc661425c314c4695c3ee7b93 100644 (file)
--- 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 a53247e876aecefe8e3652d2082d57bed5684066..3d4b995741285e6b616de4b4a2b7e8718158cad8 100644 (file)
--- 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 ccf21c7206cea1437ed193d6277fc7d230b7f4d8..770c350933b500a561795ca5f7436a88ddfeab16 100644 (file)
--- 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 cbb76e49e47cbc30c116e33584eb0db74f8ed6c4..e43f15121a6fd33f43f5b7e6010e86b62dcc3390 100644 (file)
--- 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 dcc1d9669a0070c662d6aae86fa39a893664461a..3c229d7bb4d67b2d519bf15e392bfc97f757549c 100644 (file)
--- 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 3824f1f6623a54edcec86316bf9da5b937cb339d..8f4e25f19cb47d02747e99ef164b5677a6de2a66 100644 (file)
--- 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 461923da9cc96fe3bb8d68abbb2c6e399a3024fc..0f0ddf93314623a8b1dfaaefccbf7bbd293111d3 100644 (file)
--- 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 8a5641d05c21d8171cb08c835132fbeca5c22343..4f5d738aad427c35778061bd438f4a57176dcd9e 100644 (file)
--- 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 e0bd063d6a22d03659ea5bff89c3e1068b17f5e0..eb3f078569b5d5ba1a1928ba2c1d52b047609960 100644 (file)
--- 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 3b525d470c32d9c0fed7a26bc4664add9a41ca0c..c1ecc0610a734e8522cbe3e844532fa7fc720efa 100644 (file)
--- 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 d3209f4442e00c42b6b806dafdea30ab541b1451..6b1cb4ee83c6f71a7bc234887183e43c35ac0bfa 100644 (file)
--- 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 2d73edf4872acd264008cb14d261c5c86e17511f..90cc834ebfeea430474bafb940829b5b2ee64f37 100644 (file)
--- 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 6b95bb4fbfc84170a4b74268d7ba99195c0c5289..e03f01fc93ab3e9924ce144f54696504a30344cf 100644 (file)
--- 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 2678574249b595e052377120c01d792c42b809b3..6651b43f9218aa43aaa93e15853dcc57065d4c14 100644 (file)
--- 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 f41585ff5df2a26f372d16db657d4f9ac8fd727a..10942d308e304278e386b70bc236ad07a8436a48 100644 (file)
--- 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 55e95f0eb3b291d19e533124c23231d17f46f2f1..5d6a692075f1b4fc25f8affafa11ddbb50fe092d 100644 (file)
--- 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 18f257effee33839b3afdf455b3bdb396a44809b..d8076e1f8eb4dc5da0873b9fbf1f7be989f27654 100644 (file)
--- 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 1920a146ef2829997826bab5c457bdad82eddd3f..9c9a0c2adf1398cd7a25995c89756fe316f6033c 100644 (file)
--- 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 af2c9ca982b257b60d5cfb630260927917806656..375427a50f065956f5e66ff35debd3c0db603e60 100644 (file)
--- 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 d765efe0034e34bd86f6cda6b2a24a87b89b1200..28d99cbfdeb472b1b2483aa1ac2393db8488b796 100644 (file)
--- 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 80416155c39218a96ad78d97eecd68cfb266b933..030b94bf793a5a62862f79664440a75bacc88cf7 100644 (file)
--- 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 41496754bf4b060096eaa491bb8f30c0846f91a3..fd9acc9ae17b98bf0de3ff76490bf3962a79906d 100644 (file)
--- 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 5faa586151409e83fb9d4d38c9f94d067611d6e5..1385873cc9628d4c80efd15ad60a2461f611a6ce 100644 (file)
--- 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 d97444d5c7438d6c6a6210ab100f7d7614ef5a73..93edc6a94d9bb969f78ffe6c86fe9faca315727c 100644 (file)
--- 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 64429ed75b1361fa1d55b8f99f8ef04eb2c46032..559112cdb40f1e7e53f0a214243b9d5dbdfb1242 100644 (file)
--- 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 0149084f0cc35eb42e10498eb4177df4a39533ae..a2720404353ba3acd7c47f12c3530f4b76a87897 100644 (file)
--- 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 1398feca2b6803d99ecdf892845a445798771fcc..1b0b595335f5e2e32d3171b483c086db9a592b2b 100644 (file)
--- 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 d6d8a359cd36c1863d87503d26a7ff0a7aaa2547..137c33beb278d3e6da4de30a070ccbe765ab8405 100644 (file)
--- 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 a5737a0fbfe6554f6e46b9ccb02b15e469d02ed0..ccfb79d980b9428817bf33101c000c7edacb1f59 100644 (file)
--- 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 9570f19091e06813ed33abd3b6fb8f940d402e39..5699b4e6a4186072106beb5fbe53f03f17f343db 100644 (file)
--- 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 538aa4d6dfe4f0aa6ee07a167a387c46d91ef160..7150b1810fd00b567670e90661ab2e3be030e3f4 100644 (file)
--- 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 55da756322750fe1fa30748c8032c23ad3c45f69..f511bc71c706f58e8cb1b3fd48a7664840a938f3 100644 (file)
--- 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 912b141dc3c730fc59f36048d8ab2fe319bc5e06..b4e6644c912473a49a2fb90de7d6b9b33d7721f3 100644 (file)
--- 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 68c977b84b756ee92d08d324449c4a52d5cc9ec9..a2ef63bfece43a4d5a42601bce094f40f2520a4a 100644 (file)
--- 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 a05e53427f1d52b76236319a16295c4d9fe77359..ff009c3e578c544748fa4b28c12007b446d55694 100644 (file)
--- 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 5134f5ff5267f588ec90b0de252084c78278304e..a999b96bec75296184baa63dd2e809c7525e2429 100644 (file)
--- 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 c96dd5218326a0d51c5d5e34cba79e0e3ed0aee1..029a9d6c69d095ff923a0871bf0c12e16c958ccf 100644 (file)
--- 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 834301fb1cac45be303ebcf59581de880b548ced..ddfaa315c8e89785fce4497f7036f8969c286a1f 100644 (file)
--- 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 05ca9c4526e35fe50d0ed830a036286fed9685cd..d56f427f7b516cf95b6c0d35e8c1ef56a35f921e 100644 (file)
--- 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 012d74ef9387c1c938900fff025533d7aa8dc6f6..75b0dae036991b0d1c4ceb6a1a7dbb2bc2516b64 100644 (file)
--- 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 437a4c48b5c9fd6b63fa146b46066a54222d85ab..0bde0074a9f0e12f83760ca41fed1044d5af9f8f 100644 (file)
--- 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 a4612642370451f8f93ffade984fbc6a970a87ba..0fdbc039edb768f3726fef30311a36378368acaf 100644 (file)
--- 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 5e2596f81679d44c20dd4dddfc8850e3f5e3f37d..0c861879f6524fc62ec835c5a6bb107d4f62de76 100644 (file)
--- 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 71ac3a0064e9d43ac57e2e09b0f1c1db069af8f3..7727dff814cee8600bfc4ead6fd0d8a0561ea2b0 100644 (file)
--- 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 f0f8868e2fc8bcb7cf0212a965211aa099d47adb..0173de050fe4a0464a67dc746d87a9755d95d0c8 100644 (file)
--- 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 021ed839725205ad772ddfe02bc9932f41ce6ea5..ae3a08ff70a14c321c5f1837884698dc3d66330b 100644 (file)
--- 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 061fb47f7655b9a8d9594ade79e48810b118f423..901ca313250954fed01da173f7b107ba7540d033 100644 (file)
--- 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 ef9bb9c5f9961d3e3a7a10c9b88e9bbf2aaea7f9..fb01bf23dea308dcf5f18be83010056e50ca3c87 100644 (file)
--- 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 701c306c1922d8b0882c20f4459ce6b7b7ad52aa..4c15a5aa9ba942fefc0a18d0cee740079eb5f5f5 100644 (file)
--- 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 66f222a3dbe59e718cebe529d0044d0512211358..24619a090e6d27660faf96f25f2d2861c1074776 100644 (file)
--- 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 1163a8e87aded5a10854cc4fd5de2d32153221d4..48ead759acc5a1a366aa479b7dd322cb54ff3c66 100644 (file)
--- 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 c4c6b7320d722318dcf2546d7b9d2a89f7ab5bc4..62c11e6509a3ffe14de6ce60a533c5af4b43b694 100644 (file)
--- 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 7f01f43aa351d18745468b217edbdd32fcfad8c4..a42075b1e2b25e8f325da577b9b176881506bda5 100644 (file)
--- 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 b6a87552b7ff57ddc572f69d15b6d8c8df70017d..17b3e9732cd0b500562e1a1eae47914e4e0932d3 100644 (file)
--- 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 569d4fe30f41d6d53f1a93ca4ed95944c0b94447..395f8da7e78c5dda759c196cd5e068d13cf12027 100644 (file)
--- 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 94652ab4a84ae2280d674dad3f4eaaca6457cad0..9f36347a99e48e1dcdc0b1136d2cacea7b6be709 100644 (file)
--- 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 53231dd9bcd85059663710d968d9be52d268946f..5218f12f6c891ac495d28a664120fd416c1f2279 100644 (file)
--- 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 76c429ec117d44daefef402be5242a6485e2626d..229ad5385772a55ca529f0a1b445b6692c7bb3c8 100644 (file)
--- 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 5101b6d46bca129f47395df18dfb94db1c989ab9..b55fdff5139a87d4ee5e542fc0c1ccff6cb7f0d8 100644 (file)
--- 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 20a97a3be9655a483bc87f60f0b01cb8cfe026fe..acdf04c0d52697cb05cd76bf3c039fc963a79e6e 100644 (file)
--- 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 1606218b8867aab6514a8ee770bf60e64c92664d..50285ce7ca10e62f570dbe98c359d01a36d8a7fc 100644 (file)
--- 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 bbd4dcf1922782028a5c4cef69f0968e81bf1abc..e41b8a9ad2843e282ee24213ee043d68cc18eb64 100644 (file)
--- 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 897ffaaf1bbf8417bfa698e1977e77559884c7ff..b0989aa6d305adcab47d01a21b26404a515d8c3b 100644 (file)
--- 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 d27c1f6c6b2bfe52b2c180e22c5fab5b753d2cd6..ac9f5f6df7740c4ff3820c2fc7104801e87eb829 100644 (file)
--- 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 dfbd30bdab63dd0ec297172e3c197dbf6c4aade3..86bcf31df5849d13231a06579851e7338197102e 100644 (file)
--- 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 ae758884b1e7a71c3a50e7b216635e4a81730eb0..faa84dcd46104e851a18518cdcf64b3cda4e24a4 100644 (file)
--- 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 5aa2e6208d323347500a349f39681c17095dc5aa..7e09fb7eba6b60416aa560e7c6e261b3be98a53a 100644 (file)
--- 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 c32627b464a23dbd2ea8586dfb22b36fc0707a62..db13cffbd20692a6f1113f1f71f5773386a39980 100644 (file)
--- 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 c517e50070778bbce3790838c90f70731fbcaaf0..86e0a9d6657f1af2761f41f16d2b79fbf85a8c6b 100644 (file)
--- 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 6dc1e7bd71adbb8f3b8bf4e49a7600e4b85013bf..bb388a072c4fbb85d40fc0044a42831a77f91c02 100644 (file)
--- 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 55b7a17c89063a51ead4f1a01c672b888bcb6e74..c2df9e16bf699ce81faea6e52bfc7e20dd6db2ad 100644 (file)
--- 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 9615b6f2493e2ebafce9124db3652f9bf55bf6fb..9fda647752f5d46aef3c892eb66b9b98c14c4739 100644 (file)
--- 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 6dfcf9d344ca8c32f3fa15304e57b77e858323a6..57063f4666f6942c99949913400be7d65cdcb4e4 100644 (file)
--- 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 858e852b1ef0c03beadf9b3a2ff3cad805eb12cf..2323f4d5141f5d7ba5fffce73ba522257bf3070d 100644 (file)
--- 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 e46477e4de2b8e1b4855b8ef53fe47b8b8947aa6..390b856beda16ebdc7d33072e5cab6cefbc87943 100644 (file)
--- 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 7b0de4cbfab63aab604338e64180fd7d9097bdec..18ecd1262cab5963a56d3e47442b256740249b6a 100644 (file)
--- 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 935c34fec2530d54f340e50ebacaf6d9d2bf3fc3..50a60050e579b48ac672586cda7d1cf2e4e6ac2f 100644 (file)
--- 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 4aa1b948a522aadfc443efc7e3444ce03d7ba3d1..d806bf00465f7cc336c2dddb76e272ffee21f9b3 100644 (file)
--- 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 dcc3f90696d7d7b67709d6afb3ea84d53dbe283f..c1a52eb00d778ebd30b7e3f12d5a8c159546453f 100644 (file)
--- 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 afb47199bbde163c8f180630ca5f4146ac160293..3144ba3a6c396df9d8d04b6f25e41862f5e20fb7 100644 (file)
--- 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 6fc36fbdf0458a2e510724a629cff3b979e3961a..226a725e7f963bba2e9384e87f0d286073b05da4 100644 (file)
--- 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 0b9185c379240eaefae9a0b8b93f5f5da07ddd23..c51785d0435260977d88bac2e566c9afb8a3e235 100644 (file)
--- 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 5b46e0332d6894b77b0ee4a6495a9e1ca5be26da..e6087009bcd0f7c63e16d777b9f86d491a5a339f 100644 (file)
--- 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 09d2e7a6786bb4f38eb6ad01a8fddf047b7ca9b6..1fb95df0a5835c86c45cd5bbce58a738d256acc2 100644 (file)
--- 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 1a8e743f42095803ac20129db1754aeecc1abab8..701c38e6aa5326110bb9a9485c73b89f9792414e 100644 (file)
--- 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 71f47be1b3255acdd134a1df7e1fb7ea037c7217..08c1461ab3fbefbfaf8d8fc3b91bb22fff319bcf 100644 (file)
--- 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 8f6da9ffc5a62234c5f9521e62077db5485954c3..7de2416374ee67ced280eeeadba91a33a4123426 100644 (file)
--- 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 daac9ae7041cca1f5ca48863b97196c6192c04f6..a9abb5377f1ca2e9c9d9edaed5372f25799c68ea 100644 (file)
--- 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 211811a460c801159d4e030fb3b615e0d9b5332b..ef32f70de4d100ac978ea066893ff09a58ff15e8 100644 (file)
--- 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 fcd1c2a578f80262eef7a84b50144106e29bf9d0..68e29df55db86d1d1052b69c8dff3b71f65fd49c 100644 (file)
--- 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 38cd84ff01a72d3e9f7be1f12f5e0a3c6e4d105b..20376a9df6f9542a20ca24ee88a11f78597dd32b 100644 (file)
--- 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 cfa5ecdd610c4dcdb8930d70181f07ee2f1c1c25..5a5f3ca36a21d0b981377ebb888c8f69dad8bbce 100644 (file)
--- 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 2a1989942589f22f6b69fb67c42badd0f5f47cee..5905164982bcbf29d9642b2d199c5125fadc2c87 100644 (file)
--- 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 073126ae07b44c3993f2a136a871e18ed5341a9c..eb8f47fde3edf8b452bb32bfbeaf1eb3651c4a1e 100644 (file)
--- 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 dd6a3886acf4c78aa18d30d865e02f1dbb5e03a6..2b844302c84b820364f4a9618500a9495d90eae6 100644 (file)
--- 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 84321b88f3bf312668a2500b6a750d3e6a2790c5..069b58fd883f362be3b3ac4c47036df97339b139 100644 (file)
--- 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 99d10ff36de147af6787f372c084c7ab40776532..4cfe6244e2caefece191ad7130437e8198dfa9a6 100644 (file)
--- 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 dd0a54dc63ec71fd344627418e632949bc4172d0..f060f44fe2ec21e358c7973730ce7b88dad4845d 100644 (file)
--- 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 eba7f2b06de039d63b96033625be7924390c296d..768eb9e0fe73853bed3847c0d77be989956030da 100644 (file)
--- 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 0277831f4102a78958ff40d300f4e11d293ea987..826956049a061f10040870bcc2e696de40d09e7c 100644 (file)
--- 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 d2e5e39abddc342db7fbc1afa6febff73820ed24..8ce9b65e6b67daa7e9365ec4caf4ce32de80f60f 100644 (file)
--- 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 b2ad360bf89f8ab88aa2ce15801c47118d1d98fb..64b0c260b50dd28d6d3b45ed249507f73066e2b7 100644 (file)
--- 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 e1eb9ed5c41667748fe67059394f2f04ebb12f06..884e8e895a3009ccce4b48de8250ae893e415a55 100644 (file)
--- 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 f01c2116297fa1ac04155d385ac6986233ac28a1..e062a8ee50a550deac44d211b0a4cc263ddd04d4 100644 (file)
--- 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 a00c00685ee878860736ce3a37af59507b902833..967a9fb8b382276014dd1e47961a232e3276884b 100644 (file)
--- 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 393aebf2ad247ae944021cf7b541bf5457a17162..feea712798a03997304eb600e4814bafe8f9276e 100644 (file)
--- 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 81ee50cdcba9fa65159861efc9b37353ad8835b2..070095c379c4e0e6cdbce2c21adbf87e6f940c01 100644 (file)
--- 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 8361b0b308d626c19d3ce517dd74d690762782dc..508a03c98a336722923a43afe89d5114bd59e110 100644 (file)
--- 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 aa8b58d017c7634ca90c12b4fbc954ef48e682ca..15ae20ab87930946027bb67fc4be8ecbbb92c71a 100644 (file)
--- 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 b26cfc027ab9c8f246ef87d3a16758e62c6deac7..4418cd00eca06d34e4e4a290c318c2868026ea9c 100644 (file)
--- 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 d89a877d92bb066861b634febc1164412d898fe9..d02e84ad1d92ec3b869bcb40d75495db133ec0fc 100644 (file)
--- 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 a6ef9be77a8315cc50941f79a079aea5e621035c..c464019432e7278f4338a60240b415c4f46bdada 100644 (file)
--- 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 012d0aa67a03e394e1ef82429aeb5cadab529308..9c8e106727c2ba605dfd45a247bc266f723b37f4 100644 (file)
--- 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 b9784d6941987e1d1b1c1920500d89acfa001227..177f62857a7be822a2ee3050257fc1e65091b831 100644 (file)
--- 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 028e8203f8d518a9e79a1bc1c4c541740d1f15c5..051dc6696aa5c8e4516536e6746f552f98d672bb 100644 (file)
--- 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 d1ecfab9be4484d210f2e031aca98576bd527a99..5bf7f6c0bc9bfd764463c3c175a89e134ba4f2d5 100644 (file)
--- 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 7c0e43520f50dd73a4e58cc221c4c4056a255785..040e807fb002ab8d1fad1bd1a939758b52295c59 100644 (file)
--- 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 4d76e04e0546a88a0c2034c7004b6708907ddbc2..f39209f58fe77add8e2f190f9a55364d6c062026 100644 (file)
--- 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 5db59ab45cde7649482b26f19892a5870d96ee2d..5654a062ddd97b09b1c9511ffefd307183e0f52c 100644 (file)
--- 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 4a1dfb33bbe800ac3bcb243d8a14e33bd39aa7b8..ea1f42b37369b19577e28f934d4ab4beda31e1a5 100644 (file)
--- 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 ad1df9c57d1b8b6b3a70a61cba282e53fc82ddd2..a4507113f3889261633488e463bdde1212a49e64 100644 (file)
--- 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 1445095b1e2cb69d29e558b5bfd0d654e4ca2864..1df3363dbfde60368d7abb20f7b696ed93eebec2 100644 (file)
--- 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 f340dd7e80cdaaabe54c2a3b003900120856c89f..c2a27df491bc0cf282cdf20bdd7467455b618d83 100644 (file)
--- 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 6e9dea0363269ab14ca81c7eafc7db90b7b1664a..5333bf8bfaadb62dab21ab670e2b4f80d8bb0daf 100644 (file)
--- 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 23f875a747f20da81c68ec3eca5af11571f48983..db0c8d5ae27401701d4f3c9a469849a25f86d892 100644 (file)
--- 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 ab263e54eaa25043bca7f16169d2a0eab06d3601..0e4ccb1176c9dc9352efff18917f19336477280f 100644 (file)
--- 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 a5db5b6aceeff65ce4771d785bd91302c1065b22..e6e318de37d11df3576c9b1d7763a9f325c51386 100644 (file)
--- 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 85c39c6842590077ca2915cef2b41d82c466bd8b..08dd2ea450394a5f151064afce88c821663b7f5e 100644 (file)
--- 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 b055e6378909c3d1042d80d1a4a14dc79f417ce0..b84bad2bddeefa46c87b22a9a806afa7d8a0aa5a 100644 (file)
--- 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 bf38a5b9b18f5af6596a1bcd6e1bd1f4cecc7027..d32ddac7ad902b5151324aa9593f48f0c315f953 100644 (file)
--- 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 c240d94f0cba2b5449ed3ff4b63e8943695d1198..a22abdae86f4199cf908bc233bcc208563aaae9f 100644 (file)
--- 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 0d5ee43d4115378783d08275a3b73a93937700fd..abb72e158cc05a250d6684e12229530702976912 100644 (file)
--- 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 1f72291c4a2143c05c76a2b564d6c19bf5916cfa..3d04d2b8e11121f5921b78c73a3c57d0669a797e 100644 (file)
--- 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 d5f3d74ef024671459b62f729acabc8341a99636..4aa9cb501b2d8a821de1fe5ebcd329d59ff9e673 100644 (file)
--- 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 865c5483dc5c3d25a14d2d80fd91a49c836de75f..b1a3a3fdd8321b32512c14be8ce2db407d7753a4 100644 (file)
--- 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 33b64961cfdab48464add2cc070b8e2badf43431..1bd1ea71930646cf8f17c558ef0087cbc4e9432c 100644 (file)
--- 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 66b5ba5cf55dd2c8c80c81944bca8d1662fa0a01..8e89a3fe4480328e88208be5dcc63299eb3c8d82 100644 (file)
--- 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 f60156281b7b941e6ce80fe2930ec5ee02bfe180..dca6130217040f99161cea228f2980e672ec257a 100644 (file)
--- 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 {