From bec4c059b3bda90207fe883cca68640e3564cece Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Tue, 20 Dec 2011 08:09:13 +0200 Subject: [PATCH] Make Root.init abstract, add non-abstract LegacyWindow and migrate tests --- src/com/vaadin/Application.java | 111 +++------------ src/com/vaadin/ui/Root.java | 129 +++++++++++++++++- .../component/window/AddRemoveSubWindow.java | 5 +- .../tests/server/components/TestWindow.java | 4 +- .../com/vaadin/tests/Components.java | 6 +- .../com/vaadin/tests/CustomLayoutDemo.java | 4 +- .../com/vaadin/tests/LayoutDemo.java | 4 +- .../com/vaadin/tests/ListenerOrder.java | 4 +- .../com/vaadin/tests/ModalWindow.java | 4 +- .../com/vaadin/tests/NativeWindowing.java | 13 +- .../com/vaadin/tests/Parameters.java | 4 +- .../com/vaadin/tests/RandomLayoutStress.java | 4 +- .../com/vaadin/tests/ScrollbarStressTest.java | 4 +- .../testbench/com/vaadin/tests/TestBench.java | 3 +- ...cationLayoutThatUsesWholeBrosersSpace.java | 4 +- .../vaadin/tests/TestForNativeWindowing.java | 13 +- .../com/vaadin/tests/TestForStyledUpload.java | 4 +- .../tests/TestSetVisibleAndCaching.java | 5 +- .../tests/TestSizeableIncomponents.java | 4 +- .../com/vaadin/tests/TestSplitPanel.java | 4 +- .../com/vaadin/tests/TreeFilesystem.java | 4 +- .../vaadin/tests/TreeFilesystemContainer.java | 4 +- .../com/vaadin/tests/UpgradingSample.java | 4 +- .../vaadin/tests/UsingObjectsInSelect.java | 4 +- .../vaadin/tests/appengine/GAESyncTest.java | 8 +- .../tests/application/ErrorInUnloadEvent.java | 8 +- .../applicationcontext/ChangeSessionId.java | 4 +- .../com/vaadin/tests/components/TestBase.java | 6 +- .../abstractcomponent/EnableState.java | 4 +- .../button/ButtonsInHorizontalLayout.java | 4 +- .../combobox/ComboBoxReapperingOldValue.java | 4 +- .../datefield/DateFieldInSubWindow.java | 4 +- .../datefield/DateFieldPopupOffScreen.java | 4 +- ...definedWideFormWithRelativeWideFooter.java | 4 +- .../TableInFormLayoutCausesScrolling.java | 4 +- .../LoginFormWithMultipleWindows.java | 3 +- .../menubar/MenuBarInSplitPanel.java | 6 +- .../menubar/MenuBarRunsOutOfBrowser.java | 4 +- .../VerticalLayoutWidthCalculation.java | 5 +- .../tests/components/root/LazyInitRoots.java | 37 +++-- .../splitpanel/SplitPanelExtraScrollbars.java | 4 +- .../splitpanel/SplitPanelWidthOnResize.java | 4 +- .../tests/components/table/SortLongTable.java | 4 +- .../table/TableExtraScrollbars.java | 4 +- .../table/TableHeightWhenHidingHeaders.java | 4 +- .../table/TableToggleVisibility.java | 5 +- .../table/TestCurrentPageFirstItem.java | 4 +- .../components/tabsheet/TabsheetNPE.java | 4 +- .../textfield/TextFieldInLayoutInTable.java | 6 +- .../components/tree/TreePerformanceTest.java | 4 +- .../tests/components/tree/TreeScrolling.java | 4 +- .../treetable/DisappearingComponents.java | 6 +- .../components/window/ExecuteJavaScript.java | 4 +- .../components/window/LazyWindowResize.java | 6 +- .../WindowScrollingComponentIntoView.java | 4 +- .../components/window/WindowScrollingUp.java | 4 +- .../TableWithFileSystemContainer.java | 4 +- .../sqlcontainer/CheckboxUpdateProblem.java | 4 +- .../MassInsertMemoryLeakTestApp.java | 4 +- .../IntegrationTestApplication.java | 4 +- .../integration/JSR286PortletApplication.java | 3 +- .../tests/integration/LiferayThemeDemo.java | 6 +- .../ComplexGLColumnExpansionWithColSpan.java | 4 +- .../tests/layouts/GridLayoutCaptions.java | 5 +- .../GridLayoutExpandRatioModification.java | 4 +- .../tests/layouts/GridLayoutInsidePanel2.java | 4 +- .../layouts/TestLayoutClickListeners.java | 4 +- .../layouts/TreeWithBordersInLayout.java | 4 +- ...VerticalLayoutExpandRatioModification.java | 4 +- .../layouttester/LayoutTesterApplication.java | 6 +- .../com/vaadin/tests/themes/ButtonsTest.java | 3 +- .../com/vaadin/tests/tickets/Ticket1225.java | 5 +- .../com/vaadin/tests/tickets/Ticket1230.java | 4 +- .../com/vaadin/tests/tickets/Ticket124.java | 5 +- .../com/vaadin/tests/tickets/Ticket1245.java | 6 +- .../com/vaadin/tests/tickets/Ticket1365.java | 6 +- .../com/vaadin/tests/tickets/Ticket1368.java | 4 +- .../com/vaadin/tests/tickets/Ticket1397.java | 6 +- .../com/vaadin/tests/tickets/Ticket1435.java | 5 +- .../com/vaadin/tests/tickets/Ticket1444.java | 5 +- .../tickets/Ticket1465ModalNotification.java | 4 +- .../com/vaadin/tests/tickets/Ticket1519.java | 4 +- .../com/vaadin/tests/tickets/Ticket1572.java | 6 +- .../com/vaadin/tests/tickets/Ticket1581.java | 6 +- .../com/vaadin/tests/tickets/Ticket1589.java | 4 +- .../com/vaadin/tests/tickets/Ticket1598.java | 4 +- .../com/vaadin/tests/tickets/Ticket161.java | 4 +- .../com/vaadin/tests/tickets/Ticket1632.java | 4 +- .../com/vaadin/tests/tickets/Ticket1659.java | 6 +- .../com/vaadin/tests/tickets/Ticket1663.java | 4 +- .../com/vaadin/tests/tickets/Ticket1673.java | 4 +- .../com/vaadin/tests/tickets/Ticket1710.java | 4 +- .../com/vaadin/tests/tickets/Ticket1737.java | 6 +- .../com/vaadin/tests/tickets/Ticket1767.java | 6 +- .../com/vaadin/tests/tickets/Ticket1772.java | 6 +- .../com/vaadin/tests/tickets/Ticket1775.java | 4 +- .../com/vaadin/tests/tickets/Ticket1804.java | 4 +- .../com/vaadin/tests/tickets/Ticket1805.java | 6 +- .../com/vaadin/tests/tickets/Ticket1806.java | 6 +- .../com/vaadin/tests/tickets/Ticket1811.java | 4 +- .../com/vaadin/tests/tickets/Ticket1819.java | 4 +- .../tickets/Ticket1834PanelScrolling.java | 6 +- .../com/vaadin/tests/tickets/Ticket1857.java | 8 +- .../com/vaadin/tests/tickets/Ticket1868.java | 4 +- .../com/vaadin/tests/tickets/Ticket1869.java | 4 +- .../com/vaadin/tests/tickets/Ticket1878.java | 4 +- .../com/vaadin/tests/tickets/Ticket1900.java | 4 +- .../com/vaadin/tests/tickets/Ticket1904.java | 4 +- .../com/vaadin/tests/tickets/Ticket1916.java | 4 +- .../com/vaadin/tests/tickets/Ticket1919.java | 6 +- .../com/vaadin/tests/tickets/Ticket1921.java | 4 +- .../com/vaadin/tests/tickets/Ticket1923.java | 6 +- .../com/vaadin/tests/tickets/Ticket1925.java | 4 +- .../com/vaadin/tests/tickets/Ticket1939.java | 4 +- .../com/vaadin/tests/tickets/Ticket1940.java | 4 +- .../com/vaadin/tests/tickets/Ticket1953.java | 6 +- .../com/vaadin/tests/tickets/Ticket1966.java | 4 +- .../vaadin/tests/tickets/Ticket1966_2.java | 4 +- .../vaadin/tests/tickets/Ticket1966_3.java | 4 +- .../com/vaadin/tests/tickets/Ticket1969.java | 6 +- .../com/vaadin/tests/tickets/Ticket1970.java | 25 ++-- .../com/vaadin/tests/tickets/Ticket1972.java | 4 +- .../com/vaadin/tests/tickets/Ticket1973.java | 4 +- .../vaadin/tests/tickets/Ticket1973_2.java | 4 +- .../com/vaadin/tests/tickets/Ticket1975.java | 4 +- .../com/vaadin/tests/tickets/Ticket1982.java | 4 +- .../com/vaadin/tests/tickets/Ticket1983.java | 4 +- .../com/vaadin/tests/tickets/Ticket1986.java | 4 +- .../com/vaadin/tests/tickets/Ticket1991.java | 6 +- .../com/vaadin/tests/tickets/Ticket1995.java | 4 +- .../com/vaadin/tests/tickets/Ticket20.java | 4 +- .../com/vaadin/tests/tickets/Ticket2001.java | 4 +- .../com/vaadin/tests/tickets/Ticket2002.java | 4 +- .../com/vaadin/tests/tickets/Ticket2007.java | 10 +- .../com/vaadin/tests/tickets/Ticket2009.java | 6 +- .../com/vaadin/tests/tickets/Ticket2011.java | 4 +- .../com/vaadin/tests/tickets/Ticket2014.java | 4 +- .../com/vaadin/tests/tickets/Ticket2021.java | 4 +- .../com/vaadin/tests/tickets/Ticket2022.java | 4 +- .../com/vaadin/tests/tickets/Ticket2023.java | 4 +- .../com/vaadin/tests/tickets/Ticket2024.java | 4 +- .../com/vaadin/tests/tickets/Ticket2026.java | 4 +- .../com/vaadin/tests/tickets/Ticket2029.java | 4 +- .../com/vaadin/tests/tickets/Ticket2037.java | 4 +- .../com/vaadin/tests/tickets/Ticket2038.java | 4 +- .../com/vaadin/tests/tickets/Ticket2040.java | 4 +- .../com/vaadin/tests/tickets/Ticket2042.java | 4 +- .../com/vaadin/tests/tickets/Ticket2043.java | 4 +- .../com/vaadin/tests/tickets/Ticket2048.java | 4 +- .../com/vaadin/tests/tickets/Ticket2051.java | 4 +- .../com/vaadin/tests/tickets/Ticket2053.java | 8 +- .../com/vaadin/tests/tickets/Ticket2060.java | 4 +- .../com/vaadin/tests/tickets/Ticket2061.java | 6 +- .../com/vaadin/tests/tickets/Ticket2061b.java | 6 +- .../com/vaadin/tests/tickets/Ticket2061c.java | 6 +- .../com/vaadin/tests/tickets/Ticket2062.java | 4 +- .../com/vaadin/tests/tickets/Ticket2083.java | 4 +- .../com/vaadin/tests/tickets/Ticket2090.java | 4 +- .../com/vaadin/tests/tickets/Ticket2095.java | 4 +- .../com/vaadin/tests/tickets/Ticket2098.java | 6 +- .../com/vaadin/tests/tickets/Ticket2099.java | 4 +- .../com/vaadin/tests/tickets/Ticket2101.java | 4 +- .../com/vaadin/tests/tickets/Ticket2103.java | 6 +- .../com/vaadin/tests/tickets/Ticket2104.java | 4 +- .../com/vaadin/tests/tickets/Ticket2106.java | 4 +- .../com/vaadin/tests/tickets/Ticket2107.java | 6 +- .../com/vaadin/tests/tickets/Ticket2117.java | 23 ++-- .../com/vaadin/tests/tickets/Ticket2119.java | 14 +- .../com/vaadin/tests/tickets/Ticket2125.java | 4 +- .../com/vaadin/tests/tickets/Ticket2126.java | 4 +- .../com/vaadin/tests/tickets/Ticket2151.java | 4 +- .../com/vaadin/tests/tickets/Ticket2157.java | 4 +- .../com/vaadin/tests/tickets/Ticket2178.java | 4 +- .../com/vaadin/tests/tickets/Ticket2179.java | 4 +- .../com/vaadin/tests/tickets/Ticket2180.java | 6 +- .../com/vaadin/tests/tickets/Ticket2181.java | 4 +- .../com/vaadin/tests/tickets/Ticket2186.java | 4 +- .../com/vaadin/tests/tickets/Ticket2204.java | 4 +- .../com/vaadin/tests/tickets/Ticket2208.java | 4 +- .../com/vaadin/tests/tickets/Ticket2209.java | 4 +- .../vaadin/tests/tickets/Ticket2209OL.java | 4 +- .../vaadin/tests/tickets/Ticket2209OL2.java | 4 +- .../com/vaadin/tests/tickets/Ticket2215.java | 4 +- .../com/vaadin/tests/tickets/Ticket2221.java | 4 +- .../com/vaadin/tests/tickets/Ticket2222.java | 4 +- .../Ticket2227OrderedlayoutInTable.java | 4 +- .../com/vaadin/tests/tickets/Ticket2231.java | 4 +- .../com/vaadin/tests/tickets/Ticket2232.java | 4 +- .../com/vaadin/tests/tickets/Ticket2234.java | 4 +- .../com/vaadin/tests/tickets/Ticket2235.java | 4 +- .../com/vaadin/tests/tickets/Ticket2240.java | 4 +- .../com/vaadin/tests/tickets/Ticket2242.java | 4 +- .../com/vaadin/tests/tickets/Ticket2244.java | 4 +- .../com/vaadin/tests/tickets/Ticket2245.java | 4 +- .../com/vaadin/tests/tickets/Ticket2267.java | 4 +- .../com/vaadin/tests/tickets/Ticket2271.java | 4 +- .../com/vaadin/tests/tickets/Ticket2279.java | 4 +- .../com/vaadin/tests/tickets/Ticket2282.java | 4 +- .../com/vaadin/tests/tickets/Ticket2283.java | 4 +- .../com/vaadin/tests/tickets/Ticket2287.java | 6 +- .../com/vaadin/tests/tickets/Ticket2289.java | 4 +- .../com/vaadin/tests/tickets/Ticket2292.java | 6 +- .../com/vaadin/tests/tickets/Ticket2294.java | 4 +- .../com/vaadin/tests/tickets/Ticket2296.java | 4 +- .../com/vaadin/tests/tickets/Ticket2297.java | 6 +- .../com/vaadin/tests/tickets/Ticket2303.java | 4 +- .../com/vaadin/tests/tickets/Ticket2304.java | 6 +- .../com/vaadin/tests/tickets/Ticket2310.java | 6 +- .../com/vaadin/tests/tickets/Ticket2319.java | 4 +- .../com/vaadin/tests/tickets/Ticket2323.java | 4 +- .../com/vaadin/tests/tickets/Ticket2325.java | 4 +- .../com/vaadin/tests/tickets/Ticket2329.java | 4 +- .../com/vaadin/tests/tickets/Ticket2337.java | 4 +- .../com/vaadin/tests/tickets/Ticket2339.java | 5 +- .../com/vaadin/tests/tickets/Ticket2341.java | 4 +- .../com/vaadin/tests/tickets/Ticket2344.java | 4 +- .../com/vaadin/tests/tickets/Ticket2347.java | 4 +- .../com/vaadin/tests/tickets/Ticket2364.java | 4 +- .../com/vaadin/tests/tickets/Ticket2365.java | 5 +- .../com/vaadin/tests/tickets/Ticket2398.java | 4 +- .../com/vaadin/tests/tickets/Ticket2404.java | 4 +- .../com/vaadin/tests/tickets/Ticket2405.java | 4 +- .../com/vaadin/tests/tickets/Ticket2406.java | 4 +- .../com/vaadin/tests/tickets/Ticket2407.java | 4 +- .../com/vaadin/tests/tickets/Ticket2411.java | 4 +- .../com/vaadin/tests/tickets/Ticket2415.java | 4 +- .../com/vaadin/tests/tickets/Ticket2420.java | 4 +- .../com/vaadin/tests/tickets/Ticket2425.java | 4 +- .../com/vaadin/tests/tickets/Ticket2426.java | 4 +- .../com/vaadin/tests/tickets/Ticket2431.java | 4 +- .../com/vaadin/tests/tickets/Ticket2432.java | 4 +- .../com/vaadin/tests/tickets/Ticket2434.java | 4 +- .../com/vaadin/tests/tickets/Ticket2436.java | 4 +- .../com/vaadin/tests/tickets/Ticket2526.java | 4 +- .../com/vaadin/tests/tickets/Ticket2742.java | 4 +- .../com/vaadin/tests/tickets/Ticket2901.java | 5 +- .../com/vaadin/tests/tickets/Ticket2998.java | 4 +- .../com/vaadin/tests/tickets/Ticket3146.java | 4 +- .../com/vaadin/tests/tickets/Ticket34.java | 3 +- .../com/vaadin/tests/tickets/Ticket5053.java | 4 +- .../com/vaadin/tests/tickets/Ticket5157.java | 5 +- .../com/vaadin/tests/tickets/Ticket5952.java | 31 ++--- .../com/vaadin/tests/tickets/Ticket6002.java | 4 +- .../com/vaadin/tests/tickets/Ticket677.java | 4 +- .../com/vaadin/tests/tickets/Ticket695.java | 4 +- .../com/vaadin/tests/tickets/Ticket736.java | 4 +- .../com/vaadin/tests/tickets/Ticket846.java | 4 +- .../com/vaadin/tests/tickets/Ticket932.java | 5 +- .../validation/RequiredErrorMessage.java | 4 +- 249 files changed, 769 insertions(+), 694 deletions(-) diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 388258998b..4f81a55786 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -7,7 +7,6 @@ package com.vaadin; import java.io.IOException; import java.io.Serializable; import java.lang.annotation.Annotation; -import java.net.MalformedURLException; import java.net.SocketException; import java.net.URL; import java.util.ArrayList; @@ -214,10 +213,10 @@ public class Application implements Terminal.ErrorListener, Serializable { private static final Pattern WINDOW_NAME_PATTERN = Pattern .compile("^/?([^/]+).*"); - private Root mainWindow; + private Root.LegacyWindow mainWindow; private String theme; - private Map legacyRootNames = new HashMap(); + private Map legacyRootNames = new HashMap(); /** * Sets the main window of this application. Setting window as a main @@ -226,7 +225,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * @param mainWindow * the root to set as the default window */ - public void setMainWindow(Root mainWindow) { + public void setMainWindow(Root.LegacyWindow mainWindow) { if (this.mainWindow != null) { throw new IllegalStateException( "mainWindow has already been set"); @@ -253,7 +252,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * * @return the root used as the default window */ - public Root getMainWindow() { + public Root.LegacyWindow getMainWindow() { return mainWindow; } @@ -268,7 +267,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * @see Application#getRoot(WrappedRequest) */ @Override - public Root getRoot(WrappedRequest request) { + public Root.LegacyWindow getRoot(WrappedRequest request) { String pathInfo = request.getRequestPathInfo(); String name = null; if (pathInfo != null && pathInfo.length() > 0) { @@ -278,7 +277,7 @@ public class Application implements Terminal.ErrorListener, Serializable { name = matcher.group(1); } } - Root window = getWindow(name); + Root.LegacyWindow window = getWindow(name); if (window != null) { return window; } @@ -336,7 +335,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * @return a root corresponding to the name, or null to use * the default window */ - public Root getWindow(String name) { + public Root.LegacyWindow getWindow(String name) { return legacyRootNames.get(name); } @@ -356,27 +355,13 @@ public class Application implements Terminal.ErrorListener, Serializable { * * @see #addWindow(Root, String) */ - public String addWindow(Root root) { - String name = Integer.toString(namelessRootIndex++); - addWindow(root, name); - return name; - } + public void addWindow(Root.LegacyWindow root) { + if (root.getName() == null) { + String name = Integer.toString(namelessRootIndex++); + root.setName(name); + } - /** - * Adds a named browser level window to this application. This method is - * intended to be used instead of the old pattern of assigning a name to - * the window and then adding it to the application - {@link Root} has - * no methods for setting and getting names. - * - * @param root - * the root window to add - * @param name - * the name to assign to the root - * - * @see #addWindow(Root) - */ - public void addWindow(Root root, String name) { - legacyRootNames.put(name, root); + legacyRootNames.put(root.getName(), root); root.setApplication(this); } @@ -393,8 +378,9 @@ public class Application implements Terminal.ErrorListener, Serializable { * @param root * the root to remove */ - public void removeWindow(Root root) { - for (Entry entry : legacyRootNames.entrySet()) { + public void removeWindow(Root.LegacyWindow root) { + for (Entry entry : legacyRootNames + .entrySet()) { if (entry.getValue() == root) { legacyRootNames.remove(entry.getKey()); } @@ -410,72 +396,9 @@ public class Application implements Terminal.ErrorListener, Serializable { * * @return the unmodifiable collection of windows. */ - public Collection getWindows() { + public Collection getWindows() { return Collections.unmodifiableCollection(legacyRootNames.values()); } - - /** - * Gets the full URL of a window. The returned URL is window specific - * and can be used to directly refer to the window. - *

- * Note! This method can not be used for portlets. - *

- * - * @param root - * the root to get the URL for - * - * @return the URL of the window or null if the window is - * not attached to an application - */ - public URL getWindowUrl(Root root) { - if (root.getApplication() != this) { - return null; - } - String windowName = getWindowName(root); - URL url; - try { - url = new URL(getURL(), windowName); - return url; - } catch (MalformedURLException e) { - throw new RuntimeException(e); - } - } - - /** - * Gets the unique name of a window. The name of the window is used to - * uniquely identify it. As Root doesn't have any methods for setting or - * getting its name, LegacyApplication will instead take - * care of maintaining the names assigned to windows. - *

- * 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 Application#getURL()} - * and {@code win} is the window name. - *

- *

- * Note! Portlets do not support direct window access through URLs. - *

- * - * @param root - * the root to get a name for - * - * @return the name of the root, or null if the root has - * not been added to this application - */ - public String getWindowName(Root root) { - if (root == mainWindow) { - return ""; - } else if (root.getApplication() != this) { - return null; - } - for (Entry entry : legacyRootNames.entrySet()) { - if (entry.getValue() == root) { - return entry.getKey(); - } - } - return addWindow(root); - } } /** diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java index 9e03722288..5194427c75 100644 --- a/src/com/vaadin/ui/Root.java +++ b/src/com/vaadin/ui/Root.java @@ -6,6 +6,8 @@ package com.vaadin.ui; import java.io.Serializable; 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; @@ -69,7 +71,7 @@ import com.vaadin.ui.Window.CloseListener; * @since 7.0 */ @ClientWidget(VView.class) -public class Root extends AbstractComponentContainer implements +public abstract class Root extends AbstractComponentContainer implements Action.Container, Action.Notifier { /** @@ -187,6 +189,127 @@ public class Root extends AbstractComponentContainer implements } } + /** + * Helper class to emulate the main window from Vaadin 6 using roots. This + * class should be used in the same way as Window used as a browser level + * window in Vaadin 6 together with {@Application.LegacyApplication + * } + */ + @Deprecated + public static class LegacyWindow extends Root { + private String name; + + /** + * 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(caption); + } + + /** + * Creates a legacy window with the given caption and content layout + * + * @param caption + * @param content + */ + public LegacyWindow(String caption, ComponentContainer content) { + super(caption, content); + } + + @Override + protected void init(WrappedRequest request) { + // Just empty + } + + /** + * Gets the unique name of the window. The name of the window is used to + * uniquely identify it. + *

+ * 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 Application#getURL()} + * and {@code win} is the window name. + *

+ *

+ * Note! Portlets do not support direct window access through URLs. + *

+ * + * @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. + *

+ * 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 Application#getURL()} + * and {@code win} is the window name. + *

+ *

+ * This method can only be called before the window is added to an + * application. + *

+ * Note! Portlets do not support direct window access through URLs. + *

+ * + * @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 (getApplication() != 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. + *

+ * Note! This method can not be used for portlets. + *

+ * + * @return the URL of the window or null if the window is not attached + * to an application + */ + public URL getURL() { + Application 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"); + } + } + } + private static final Method FRAGMENT_CHANGED_METHOD; static { @@ -977,9 +1100,7 @@ public class Root extends AbstractComponentContainer implements * @param request * the wrapped request that caused this root to be created */ - protected void init(WrappedRequest request) { - // Default implementation doesn't do anything - } + protected abstract void init(WrappedRequest request); /** * Sets the thread local for the current root. This method is used by the diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java index 79ab831500..ed01e07e06 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java @@ -8,6 +8,7 @@ import org.junit.Test; import com.vaadin.Application; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; public class AddRemoveSubWindow { @@ -16,7 +17,7 @@ public class AddRemoveSubWindow { @Override public void init() { - Root w = new Root("Main window"); + LegacyWindow w = new LegacyWindow("Main window"); setMainWindow(w); } } @@ -44,7 +45,7 @@ public class AddRemoveSubWindow { // Try to add the same sub window to another window try { - Root w = new Root(); + LegacyWindow w = new LegacyWindow(); w.addWindow(subWindow); assertTrue("Window.addWindow did not throw the expected exception", false); diff --git a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java index 01d6e61512..11462b8328 100644 --- a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java +++ b/tests/server-side/com/vaadin/tests/server/components/TestWindow.java @@ -7,7 +7,7 @@ import junit.framework.TestCase; import org.easymock.EasyMock; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.CloseEvent; import com.vaadin.ui.Window.CloseListener; @@ -21,7 +21,7 @@ public class TestWindow extends TestCase { @Override protected void setUp() throws Exception { window = new Window(); - new Root().addWindow(window); + new LegacyWindow().addWindow(window); } public void testCloseListener() { diff --git a/tests/testbench/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java index 042e9ffc3c..ce5122a378 100644 --- a/tests/testbench/com/vaadin/tests/Components.java +++ b/tests/testbench/com/vaadin/tests/Components.java @@ -24,7 +24,7 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ItemStyleGenerator; import com.vaadin.ui.VerticalLayout; @@ -35,7 +35,7 @@ public class Components extends Application.LegacyApplication { private Map>, String> tests = new HashMap>, String>(); private Tree naviTree; private HorizontalSplitPanel sp; - private Root mainWindow; + private LegacyWindow mainWindow; private final Embedded applicationEmbedder = new Embedded(); private String baseUrl; private List> componentsWithoutTests = new ArrayList>(); @@ -86,7 +86,7 @@ public class Components extends Application.LegacyApplication { @Override public void init() { - mainWindow = new Root(); + mainWindow = new LegacyWindow(); setTheme("tests-components"); mainWindow.getContent().setSizeFull(); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java index af06e1cfb8..381d404f39 100644 --- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java @@ -13,7 +13,7 @@ import com.vaadin.ui.Field; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.PasswordField; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; @@ -56,7 +56,7 @@ public class CustomLayoutDemo extends com.vaadin.Application.LegacyApplication */ @Override public void init() { - final Root mainWindow = new Root("CustomLayout demo"); + final LegacyWindow mainWindow = new LegacyWindow("CustomLayout demo"); setMainWindow(mainWindow); // set the application to use example -theme diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java index 0f1395dcbb..f230b8ca37 100644 --- a/tests/testbench/com/vaadin/tests/LayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java @@ -12,7 +12,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ public class LayoutDemo extends com.vaadin.Application.LegacyApplication { */ @Override public void init() { - final Root mainWindow = new Root("Layout demo"); + final LegacyWindow mainWindow = new LegacyWindow("Layout demo"); setMainWindow(mainWindow); // diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/tests/testbench/com/vaadin/tests/ListenerOrder.java index a5283283fe..797561eb00 100644 --- a/tests/testbench/com/vaadin/tests/ListenerOrder.java +++ b/tests/testbench/com/vaadin/tests/ListenerOrder.java @@ -13,7 +13,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; public class ListenerOrder extends com.vaadin.Application.LegacyApplication @@ -32,7 +32,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication } public void createNewView() { - final Root main = new Root("Test window"); + final LegacyWindow main = new LegacyWindow("Test window"); setMainWindow(main); main.removeAllComponents(); diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java index ba3a4b32a4..c848803642 100644 --- a/tests/testbench/com/vaadin/tests/ModalWindow.java +++ b/tests/testbench/com/vaadin/tests/ModalWindow.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -32,7 +32,7 @@ public class ModalWindow extends com.vaadin.Application.LegacyApplication public void init() { // Create main window - final Root main = new Root("ModalWindow demo"); + final LegacyWindow main = new LegacyWindow("ModalWindow demo"); setMainWindow(main); main.addComponent(new Label("ModalWindow demo")); diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 2ce18f1d22..72ae78e7d0 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -11,12 +11,12 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; public class NativeWindowing extends Application.LegacyApplication { - Root main = new Root("Windowing test"); + LegacyWindow main = new LegacyWindow("Windowing test"); @Override public void init() { @@ -96,16 +96,17 @@ public class NativeWindowing extends Application.LegacyApplication { } @Override - public Root getWindow(String name) { + public LegacyWindow getWindow(String name) { - final Root w = super.getWindow(name); + final LegacyWindow w = super.getWindow(name); if (w != null) { return w; } if (name != null && name.startsWith("mainwin-")) { final String postfix = name.substring("mainwin-".length()); - final Root ww = new Root("Window: " + postfix); + final LegacyWindow ww = new LegacyWindow("Window: " + postfix); + ww.setName(name); ww.addComponent(new Label( "This is a application-level window opened with name: " + name)); @@ -117,7 +118,7 @@ public class NativeWindowing extends Application.LegacyApplication { + " times")); } })); - addWindow(ww, name); + addWindow(ww); return ww; } diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index 3caae1ff14..8d940101c3 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -18,7 +18,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -40,7 +40,7 @@ public class Parameters extends com.vaadin.Application.LegacyApplication @Override public void init() { - final Root main = new Root("Parameters demo"); + final LegacyWindow main = new LegacyWindow("Parameters demo"); setMainWindow(main); // This class acts both as URI handler and parameter handler diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java index 41aceed403..0390ea8157 100644 --- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java +++ b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java @@ -17,7 +17,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; @@ -49,7 +49,7 @@ public class RandomLayoutStress extends */ @Override public void init() { - final Root mainWindow = new Root("Layout demo"); + final LegacyWindow mainWindow = new LegacyWindow("Layout demo"); setMainWindow(mainWindow); // Create horizontal ordered layout diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java index b9a7e0b180..bd40a7fb7b 100644 --- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java @@ -10,7 +10,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -19,7 +19,7 @@ import com.vaadin.ui.Window; public class ScrollbarStressTest extends Application.LegacyApplication { - final Root main = new Root("Scrollbar Stress Test"); + final LegacyWindow main = new LegacyWindow("Scrollbar Stress Test"); final Panel panel = new Panel("Panel"); final VerticalSplitPanel splitPanel = new VerticalSplitPanel(); diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index 9755495be5..c3bb24cbef 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -25,6 +25,7 @@ import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.Root; import com.vaadin.ui.Root.FragmentChangedEvent; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -47,7 +48,7 @@ public class TestBench extends com.vaadin.Application.LegacyApplication HierarchicalContainer testables = new HierarchicalContainer(); - Root mainWindow = new Root("TestBench window"); + LegacyWindow mainWindow = new LegacyWindow("TestBench window"); // Main layout consists of tree menu and body layout HorizontalSplitPanel mainLayout = new HorizontalSplitPanel(); diff --git a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index c737bd6c64..c4b96e59b4 100644 --- a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -7,7 +7,7 @@ package com.vaadin.tests; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; @@ -15,7 +15,7 @@ import com.vaadin.ui.VerticalSplitPanel; public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends Application.LegacyApplication { - Root main = new Root("Windowing test"); + LegacyWindow main = new LegacyWindow("Windowing test"); VerticalLayout rootLayout; diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index 6e93144e7c..1e13c6095d 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -11,12 +11,12 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; public class TestForNativeWindowing extends Application.LegacyApplication { - Root main = new Root("Windowing test"); + LegacyWindow main = new LegacyWindow("Windowing test"); @Override public void init() { @@ -96,16 +96,17 @@ public class TestForNativeWindowing extends Application.LegacyApplication { } @Override - public Root getWindow(String name) { + public LegacyWindow getWindow(String name) { - final Root w = super.getWindow(name); + final LegacyWindow w = super.getWindow(name); if (w != null) { return w; } if (name != null && name.startsWith("mainwin-")) { final String postfix = name.substring("mainwin-".length()); - final Root ww = new Root("Window: " + postfix); + final LegacyWindow ww = new LegacyWindow("Window: " + postfix); + ww.setName(name); ww.addComponent(new Label( "This is a application-level window opened with name: " + name)); @@ -117,7 +118,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { + " times")); } })); - addWindow(ww, name); + addWindow(ww); return ww; } diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index 32a5226e5c..96115d505e 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -23,7 +23,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.FailedEvent; import com.vaadin.ui.Upload.FailedListener; @@ -286,7 +286,7 @@ public class TestForStyledUpload extends Application.LegacyApplication @Override public void init() { - Root w = new Root(); + LegacyWindow w = new LegacyWindow(); setTheme("runo"); w.addComponent(main); setMainWindow(w); diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java index 814377b83b..a46253598f 100644 --- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class TestSetVisibleAndCaching extends com.vaadin.Application.LegacyApplication { @@ -24,7 +24,8 @@ public class TestSetVisibleAndCaching extends @Override public void init() { - final Root mainWindow = new Root("TestSetVisibleAndCaching"); + final LegacyWindow mainWindow = new LegacyWindow( + "TestSetVisibleAndCaching"); setMainWindow(mainWindow); panelA.addComponent(new Label( diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index 68793e7863..a9005e7fd3 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -25,7 +25,7 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -42,7 +42,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { initComponentList(); - Root w = new Root(); + LegacyWindow w = new LegacyWindow(); setMainWindow(w); setTheme("tests-components"); diff --git a/tests/testbench/com/vaadin/tests/TestSplitPanel.java b/tests/testbench/com/vaadin/tests/TestSplitPanel.java index b4b9a38e42..87c8309faf 100644 --- a/tests/testbench/com/vaadin/tests/TestSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/TestSplitPanel.java @@ -5,7 +5,7 @@ package com.vaadin.tests; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalSplitPanel; public class TestSplitPanel extends com.vaadin.Application.LegacyApplication { @@ -14,7 +14,7 @@ public class TestSplitPanel extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root mainWindow = new Root("Feature Browser"); + final LegacyWindow mainWindow = new LegacyWindow("Feature Browser"); setMainWindow(mainWindow); verticalSplit.setFirstComponent(new Label("vertical first")); diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java index e4fd7aaa7e..787a955a7e 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java @@ -10,7 +10,7 @@ import com.vaadin.data.Item; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.ExpandEvent; @@ -33,7 +33,7 @@ public class TreeFilesystem extends com.vaadin.Application.LegacyApplication @Override public void init() { - final Root main = new Root("Tree filesystem demo"); + final LegacyWindow main = new LegacyWindow("Tree filesystem demo"); setMainWindow(main); // Main window contains heading and panel diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java index 2e5ca3c9a2..1b32a35a38 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Component.Listener; import com.vaadin.ui.Field; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -43,7 +43,7 @@ public class TreeFilesystemContainer extends @Override public void init() { - final Root w = new Root("Tree FilesystemContainer demo"); + final LegacyWindow w = new LegacyWindow("Tree FilesystemContainer demo"); setMainWindow(w); final VerticalLayout main = new VerticalLayout(); w.setContent(main); diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java index 0be07cea27..0db63ca789 100644 --- a/tests/testbench/com/vaadin/tests/UpgradingSample.java +++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java @@ -19,7 +19,7 @@ import com.vaadin.ui.CustomComponent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -57,7 +57,7 @@ public class UpgradingSample extends Application.LegacyApplication implements public void init() { // Create the main window of the application - final Root main = new Root("Login example", layout); + final LegacyWindow main = new LegacyWindow("Login example", layout); setMainWindow(main); // Add menu and loginbox to the application diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java index a7848f070f..b48f85f52d 100644 --- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java @@ -11,7 +11,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; public class UsingObjectsInSelect extends @@ -27,7 +27,7 @@ public class UsingObjectsInSelect extends @Override public void init() { - final Root main = new Root("Select demo"); + final LegacyWindow main = new LegacyWindow("Select demo"); setMainWindow(main); final Panel panel = new Panel("Select demo"); diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java index be5e3bfdd4..7d5e298286 100644 --- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class GAESyncTest extends Application.LegacyApplication { @@ -45,7 +45,7 @@ public class GAESyncTest extends Application.LegacyApplication { } - private class IntrWindow extends Root { + private class IntrWindow extends LegacyWindow { private int n = 0; private static final long serialVersionUID = -6521351715072191625l; TextField tf; @@ -139,8 +139,8 @@ public class GAESyncTest extends Application.LegacyApplication { } @Override - public Root getWindow(String name) { - Root w = super.getWindow(name); + public LegacyWindow getWindow(String name) { + LegacyWindow w = super.getWindow(name); if (w == null) { w = new IntrWindow(this); addWindow(w); diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java index 2e007831cb..fcc4e26b55 100644 --- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java +++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java @@ -10,13 +10,13 @@ import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.PasswordField; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; public class ErrorInUnloadEvent extends AbstractTestCase { - private Root mainWindow; + private LegacyWindow mainWindow; @Override public void init() { @@ -29,7 +29,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { private void showLoginWindow() { if (mainWindow == null) { - mainWindow = new Root(); + mainWindow = new LegacyWindow(); setMainWindow(mainWindow); } else { mainWindow.removeAllComponents(); @@ -62,7 +62,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { private void showMainWindow() { if (mainWindow == null) { - mainWindow = new Root(); + mainWindow = new LegacyWindow(); setMainWindow(mainWindow); } else { mainWindow.removeAllComponents(); diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java index e0abe5f4c4..d1447cb091 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -6,7 +6,7 @@ import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class ChangeSessionId extends AbstractTestCase { @@ -16,7 +16,7 @@ public class ChangeSessionId extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root("Sestest Application"); + LegacyWindow mainWindow = new LegacyWindow("Sestest Application"); mainWindow.addComponent(log); mainWindow.addComponent(loginButton); mainWindow.addComponent(new Button("Show session id", diff --git a/tests/testbench/com/vaadin/tests/components/TestBase.java b/tests/testbench/com/vaadin/tests/components/TestBase.java index 346a819cb9..7ddbf45263 100644 --- a/tests/testbench/com/vaadin/tests/components/TestBase.java +++ b/tests/testbench/com/vaadin/tests/components/TestBase.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public abstract class TestBase extends AbstractTestCase { @Override public final void init() { - window = new Root(getClass().getName()); + window = new LegacyWindow(getClass().getName()); setMainWindow(window); window.getContent().setSizeFull(); @@ -24,7 +24,7 @@ public abstract class TestBase extends AbstractTestCase { setup(); } - private Root window; + private LegacyWindow window; private VerticalLayout layout; public TestBase() { diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java index 4e83543632..946246d59a 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -6,12 +6,12 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class EnableState extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root("Helloworld Application"); + LegacyWindow mainWindow = new LegacyWindow("Helloworld Application"); final Panel panel = new Panel("Test"); final Button button = new Button("ablebutton"); diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java index 2b4ed733e0..bf98c83585 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.button; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class ButtonsInHorizontalLayout extends AbstractTestCase { @@ -21,7 +21,7 @@ public class ButtonsInHorizontalLayout extends AbstractTestCase { layout.addComponent(new Button( "Look at me in IE7 or IE8 in compatibility mode")); content.addComponent(layout); - setMainWindow(new Root("", content)); + setMainWindow(new LegacyWindow("", content)); } @Override diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index ad3ec79ad4..c78ff7675f 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -8,7 +8,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") @@ -20,7 +20,7 @@ public class ComboBoxReapperingOldValue extends Application.LegacyApplication @Override public void init() { - Root mainWindow = new Root("ComboBoxCacheTest"); + LegacyWindow mainWindow = new LegacyWindow("ComboBoxCacheTest"); setMainWindow(mainWindow); VerticalLayout layout = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 753df3c7cd..298359068e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -13,7 +13,7 @@ import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Field; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -119,7 +119,7 @@ public class DateFieldInSubWindow extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root(); + LegacyWindow mainWindow = new LegacyWindow(); setMainWindow(mainWindow); Button open = new Button("Open window", new Button.ClickListener() { public void buttonClick(ClickEvent event) { diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java index afe4264ff8..5ea909b687 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.DateField; import com.vaadin.ui.DateField.Resolution; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class DateFieldPopupOffScreen extends AbstractTestCase { @@ -23,7 +23,7 @@ public class DateFieldPopupOffScreen extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root(getClass().getName()); + LegacyWindow mainWindow = new LegacyWindow(getClass().getName()); GridLayout mainLayout = new GridLayout(3, 3); mainLayout.setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java index d6638420cc..21430d8936 100644 --- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java +++ b/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; @SuppressWarnings("serial") @@ -15,7 +15,7 @@ public class UndefinedWideFormWithRelativeWideFooter extends @Override public void init() { - Root w = new Root("Test"); + LegacyWindow w = new LegacyWindow("Test"); setMainWindow(w); final Form f = new Form(); diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java index dc626a4809..2919cfcb44 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; @@ -11,7 +11,7 @@ public class TableInFormLayoutCausesScrolling extends AbstractTestCase { @Override public void init() { // Window Initialization. - final Root window = new Root("Main Window"); + final LegacyWindow window = new LegacyWindow("Main Window"); setMainWindow(window); // FormLayout creation diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index ad87549e50..1295cadf95 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -6,6 +6,7 @@ import com.vaadin.ui.LoginForm; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; @SuppressWarnings("serial") public class LoginFormWithMultipleWindows extends Application { @@ -15,7 +16,7 @@ public class LoginFormWithMultipleWindows extends Application { return new LoginFormWindow(); } - public class LoginFormWindow extends Root { + public class LoginFormWindow extends LegacyWindow { public LoginFormWindow() { super(); diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java index a2fc47533e..e73d31bf04 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java @@ -4,7 +4,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -22,8 +22,8 @@ public class MenuBarInSplitPanel extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root("MenuBar in SplitPanel", - new HorizontalSplitPanel()); + LegacyWindow mainWindow = new LegacyWindow( + "MenuBar in SplitPanel", new HorizontalSplitPanel()); VerticalLayout left = new VerticalLayout(); mainWindow.addComponent(left); left.setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java index 1b0834c4cf..c3a9223e61 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java @@ -4,7 +4,7 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Alignment; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class MenuBarRunsOutOfBrowser extends AbstractTestCase { @@ -12,7 +12,7 @@ public class MenuBarRunsOutOfBrowser extends AbstractTestCase { @Override public void init() { setTheme("runo"); - Root main = new Root("Test"); + LegacyWindow main = new LegacyWindow("Test"); main.setSizeFull(); setMainWindow(main); main.getContent().setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index 2503b26efe..f20f26153f 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -4,7 +4,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -12,7 +12,8 @@ import com.vaadin.ui.Window; public class VerticalLayoutWidthCalculation extends AbstractTestCase { @Override public void init() { - final Root mainWindow = new Root("Vaadintest Application"); + final LegacyWindow mainWindow = new LegacyWindow( + "Vaadintest Application"); mainWindow.addWindow(createSubWindow()); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java index f7b7c25d64..77949264b0 100644 --- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java +++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java @@ -6,7 +6,6 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.tests.components.AbstractTestApplication; -import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.Root; @@ -29,14 +28,17 @@ public class LazyInitRoots extends AbstractTestApplication { throws RootRequiresMoreInformation { if (request.getParameter("lazyCreate") != null) { // Root created on second request - BrowserDetails browserDetails = request.getBrowserDetails(); + final BrowserDetails browserDetails = request.getBrowserDetails(); if (browserDetails == null) { throw new RootRequiresMoreInformation(); } else { - Root root = new Root(); - root.getContent().addComponent( - new Label("Lazy create root: " + Root root = new Root() { + @Override + protected void init(WrappedRequest request) { + addComponent(new Label("Lazy create root: " + browserDetails.getUriFragment())); + } + }; return root; } } else if (request.getParameter("lazyInit") != null) { @@ -44,17 +46,22 @@ public class LazyInitRoots extends AbstractTestApplication { return new LazyInitRoot(); } else { // The standard root - Root root = new Root(); - ComponentContainer content = root.getContent(); - Link lazyCreateLink = new Link("Open lazyCreate root", - new ExternalResource(getURL() + "?lazyCreate#lazyCreate")); - lazyCreateLink.setTargetName("_blank"); - content.addComponent(lazyCreateLink); + Root root = new Root() { + @Override + protected void init(WrappedRequest request) { + Link lazyCreateLink = new Link("Open lazyCreate root", + new ExternalResource(getURL() + + "?lazyCreate#lazyCreate")); + lazyCreateLink.setTargetName("_blank"); + addComponent(lazyCreateLink); - Link lazyInitLink = new Link("Open lazyInit root", - new ExternalResource(getURL() + "?lazyInit#lazyInit")); - lazyInitLink.setTargetName("_blank"); - content.addComponent(lazyInitLink); + Link lazyInitLink = new Link("Open lazyInit root", + new ExternalResource(getURL() + + "?lazyInit#lazyInit")); + lazyInitLink.setTargetName("_blank"); + addComponent(lazyInitLink); + } + }; return root; } diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index 5f9d050954..983736b21d 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class SplitPanelExtraScrollbars extends AbstractTestCase implements ClickListener { @@ -32,7 +32,7 @@ public class SplitPanelExtraScrollbars extends AbstractTestCase implements sp.setSecondComponent(hl); hl.addComponent(b); - Root w = new Root("Test", sp); + LegacyWindow w = new LegacyWindow("Test", sp); setMainWindow(w); } diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java index 51d0abb5f7..114e6bcbcd 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java @@ -5,7 +5,7 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -15,7 +15,7 @@ public class SplitPanelWidthOnResize extends AbstractTestCase { public void init() { VerticalLayout layout = new VerticalLayout(); layout.setSizeFull(); - Root w = new Root("", layout); + LegacyWindow w = new LegacyWindow("", layout); setMainWindow(w); HorizontalSplitPanel splitPanel = new HorizontalSplitPanel(); Button button = new NativeButton("A huge button"); diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java index 4297759c34..15872aa849 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.AbstractTestCase; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -11,7 +11,7 @@ public class SortLongTable extends AbstractTestCase { public void init() { final int NUMBER_OF_ROWS = 100; // Works with 10 - Root mainWindow = new Root("Table Sort Test"); + LegacyWindow mainWindow = new LegacyWindow("Table Sort Test"); mainWindow.setSizeFull(); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java index 79c24bdf94..c8721f39e9 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java @@ -4,7 +4,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.AbstractTestCase; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -16,7 +16,7 @@ public class TableExtraScrollbars extends AbstractTestCase { @Override public void init() { setTheme("runo"); - Root w = new Root("Table scrollbars bug example"); + LegacyWindow w = new LegacyWindow("Table scrollbars bug example"); setMainWindow(w); VerticalLayout vl = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 59b89f3d7f..27b962cddd 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -4,7 +4,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; /** @@ -18,7 +18,7 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase { @Override public void init() { - Root mainWindow = new Root(); + LegacyWindow mainWindow = new LegacyWindow(); setMainWindow(mainWindow); final Table table = new Table("Test table"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java index b3ffc0e65c..b02da80933 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -112,7 +112,8 @@ public class TableToggleVisibility extends AbstractTestCase { mainLayout.addComponent(split); mainLayout.setExpandRatio(split, 1.0f); - Root mainWindow = new Root("Visibilitybug Application", mainLayout); + LegacyWindow mainWindow = new LegacyWindow("Visibilitybug Application", + mainLayout); mainWindow.setSizeFull(); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index 4218850214..13493a5666 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -7,7 +7,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -23,7 +23,7 @@ public class TestCurrentPageFirstItem extends Application.LegacyApplication @Override public void init() { try { - Root main = new Root("Table header Test"); + LegacyWindow main = new LegacyWindow("Table header Test"); setMainWindow(main); main.setSizeFull(); // setTheme("testtheme"); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index 48e8958f92..98a6bd9e11 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.VerticalLayout; @@ -29,7 +29,7 @@ public class TabsheetNPE extends AbstractTestCase implements ClickListener { @Override public void init() { - setMainWindow(new Root("TabSheet Demo", createMainLayout())); + setMainWindow(new LegacyWindow("TabSheet Demo", createMainLayout())); } private VerticalLayout createMainLayout() { diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java index abe53f6378..cb5213bf5c 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java @@ -3,18 +3,18 @@ package com.vaadin.tests.components.textfield; import com.vaadin.Application; import com.vaadin.ui.Component; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -@SuppressWarnings("serial") public class TextFieldInLayoutInTable extends Application.LegacyApplication { @Override public void init() { - final Root mainWindow = new Root(this.getClass().getName()); + final LegacyWindow mainWindow = new LegacyWindow(this.getClass() + .getName()); setMainWindow(mainWindow); final Table table = new Table(); diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java index 7d6716c5c9..9d58762f60 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -20,7 +20,7 @@ public class TreePerformanceTest extends AbstractTestCase { @Override public void init() { - Root w = new Root(); + LegacyWindow w = new LegacyWindow(); setMainWindow(w); Layout layout = null; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java index 31644930ea..43d4508f95 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -13,7 +13,7 @@ public class TreeScrolling extends AbstractTestCase { public void init() { VerticalLayout layout = new VerticalLayout(); layout.setSizeUndefined(); - Root w = new Root("", layout); + LegacyWindow w = new LegacyWindow("", layout); setMainWindow(w); TextField filler1 = new TextField(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java index 84771a2239..329e5d291d 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -3,14 +3,14 @@ package com.vaadin.tests.components.treetable; import com.vaadin.terminal.ExternalResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Link; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TreeTable; public class DisappearingComponents extends AbstractTestCase { @Override -public void init() { - Root mainWindow = new Root("Application"); + public void init() { + LegacyWindow mainWindow = new LegacyWindow("Application"); final TreeTable tt = new TreeTable(); tt.setSizeUndefined(); tt.setWidth("100%"); diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java index 7b4d2c4058..bf979b1aa3 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -4,13 +4,13 @@ import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class ExecuteJavaScript extends AbstractTestCase { @Override public void init() { - final Root mainWindow = new Root("Test"); + final LegacyWindow mainWindow = new LegacyWindow("Test"); setMainWindow(mainWindow); for (final String script : new String[] { "alert('foo');", diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java index 820265b04a..d85ed1df60 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java @@ -7,16 +7,16 @@ import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; import com.vaadin.ui.Root.BrowserWindowResizeEvent; import com.vaadin.ui.Root.BrowserWindowResizeListener; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; public class LazyWindowResize extends AbstractTestCase { - private Root mainWindow; + private LegacyWindow mainWindow; private Window subWindow; private CheckBox lazyMode; private Log log = new Log(5); @@ -49,7 +49,7 @@ public class LazyWindowResize extends AbstractTestCase { @Override public void init() { - mainWindow = new Root("Resize test"); + mainWindow = new LegacyWindow("Resize test"); setMainWindow(mainWindow); subWindow = new Window("Sub window"); subWindow.setHeight("50%"); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index 6e94333235..310ca101fb 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -30,7 +30,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { Table table = new Table(); table.setPageLength(50); - setMainWindow(new Root("")); + setMainWindow(new LegacyWindow("")); getMainWindow().getContent().setSizeUndefined(); Component l2 = null; diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java index 559fe435d0..2faf6a6f21 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class WindowScrollingUp extends AbstractTestCase { @@ -31,7 +31,7 @@ public class WindowScrollingUp extends AbstractTestCase { } }); - setMainWindow(new Root("")); + setMainWindow(new LegacyWindow("")); getMainWindow().addComponent(table); getMainWindow().addComponent(up); diff --git a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java index c87f4fe4a0..459c234c24 100644 --- a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java +++ b/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java @@ -4,7 +4,7 @@ import java.io.File; import com.vaadin.data.util.FilesystemContainer; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class TableWithFileSystemContainer extends TestBase { @@ -13,7 +13,7 @@ public class TableWithFileSystemContainer extends TestBase { @Override public void setup() { - setMainWindow(new Root("")); + setMainWindow(new LegacyWindow("")); Table table = new Table("Documents", new FilesystemContainer(new File( testPath))); table.setWidth("100%"); diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index c1cbcf0e85..674f610ed7 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -19,7 +19,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class CheckboxUpdateProblem extends Application.LegacyApplication @@ -32,7 +32,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication @Override public void init() { - setMainWindow(new Root("Test window")); + setMainWindow(new LegacyWindow("Test window")); horizontalSplit.setSizeFull(); testList = new Table(); diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index 39a0558079..2b76612c35 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; // author table in testdb (MySQL) is set out as follows @@ -32,7 +32,7 @@ public class MassInsertMemoryLeakTestApp extends Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root("SQLContainer Test", buildLayout())); + setMainWindow(new LegacyWindow("SQLContainer Test", buildLayout())); process.addListener(new Button.ClickListener() { public void buttonClick(ClickEvent event) { diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java index 10c6c1124e..b2001bdd7e 100644 --- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -7,14 +7,14 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.Resource; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class IntegrationTestApplication extends Application.LegacyApplication { @Override public void init() { - Root window = new Root("Vaadin Application"); + LegacyWindow window = new LegacyWindow("Vaadin Application"); setMainWindow(window); final Table table = new Table(); diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java index 646897d8e4..4661faf8ea 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -25,6 +25,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; /** @@ -32,7 +33,7 @@ import com.vaadin.ui.TextField; */ public class JSR286PortletApplication extends Application.LegacyApplication { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); TextField tf = new TextField("Some value"); Label userInfo = new Label(); Link portletEdit = new Link(); diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java index 61f05cea63..0900bc0b56 100644 --- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -36,7 +36,7 @@ import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Slider; import com.vaadin.ui.Slider.ValueOutOfBoundsException; import com.vaadin.ui.TabSheet; @@ -62,7 +62,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { private static final Resource ICON_OK = new ThemeResource( "../runo/icons/16/ok.png"); - private Root main; + private LegacyWindow main; private VerticalLayout mainLayout; private TabSheet tabs; @@ -82,7 +82,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { @Override public void init() { - main = new Root("Vaadin Liferay Theme"); + main = new LegacyWindow("Vaadin Liferay Theme"); mainLayout = (VerticalLayout) main.getContent(); mainLayout.setMargin(false); setMainWindow(main); diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index 2a071117e6..f1e05b6fee 100644 --- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -4,7 +4,7 @@ import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -29,7 +29,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { mainLayout.setMargin(true); mainLayout.setHeight(100, Sizeable.UNITS_PERCENTAGE); mainLayout.setWidth(100, Sizeable.UNITS_PERCENTAGE); - setMainWindow(new Root("Vaadin Test", mainLayout)); + setMainWindow(new LegacyWindow("Vaadin Test", mainLayout)); cols = 1; final GridLayout gl = new GridLayout(cols, 3); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java index d16f2c90f8..987152f529 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Form; import com.vaadin.ui.FormFieldFactory; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -174,7 +174,8 @@ public class GridLayoutCaptions extends TestBase { @Override protected void setup() { - Root mainWindow = new Root("Formlayoutcaptionboom Application"); + LegacyWindow mainWindow = new LegacyWindow( + "Formlayoutcaptionboom Application"); Label label = new Label("Hello Vaadin user"); mainWindow.addComponent(label); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 17c58aab53..f7f4ac2d4c 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -21,7 +21,7 @@ public class GridLayoutExpandRatioModification extends TestBase implements @Override public void setup() { - Root main = new Root("The Main Window"); + LegacyWindow main = new LegacyWindow("The Main Window"); mainLayout = new GridLayout(3, 3); main.setContent(mainLayout); setMainWindow(main); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java index 382294bb86..d6ea84e44e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class GridLayoutInsidePanel2 extends Application.LegacyApplication { @@ -12,7 +12,7 @@ public class GridLayoutInsidePanel2 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root("Main"); + LegacyWindow w = new LegacyWindow("Main"); setMainWindow(w); layout = (Layout) w.getContent(); GridLayout gl = new GridLayout(1, 1); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java index 3cb9f74cab..f18afec6d6 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -13,7 +13,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -23,7 +23,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { @Override public void init() { - Root w = new Root("main window"); + LegacyWindow w = new LegacyWindow("main window"); setMainWindow(w); setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java index c92b744c23..4d1a4b38ae 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java @@ -2,7 +2,7 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -14,7 +14,7 @@ public class TreeWithBordersInLayout extends AbstractTestCase { public void init() { Layout mainLayout = new VerticalLayout(); mainLayout.setSizeUndefined(); - setMainWindow(new Root("main window", mainLayout)); + setMainWindow(new LegacyWindow("main window", mainLayout)); setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 91690bffd7..303918f7c5 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -20,7 +20,7 @@ public class VerticalLayoutExpandRatioModification extends TestBase implements @Override public void setup() { - Root main = new Root("The Main Window"); + LegacyWindow main = new LegacyWindow("The Main Window"); mainLayout = new VerticalLayout(); main.setContent(mainLayout); setMainWindow(main); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index 43536e7eeb..6a524cd024 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -11,7 +11,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; @@ -22,12 +22,12 @@ public class LayoutTesterApplication extends AbstractTestCase { private int layoutCount = 1; private Method[] layoutGetters; - private Root mainWindow; + private LegacyWindow mainWindow; private NativeSelect layoutSelector; @Override public void init() { - mainWindow = new Root("LayoutTesterApplication"); + mainWindow = new LegacyWindow("LayoutTesterApplication"); setMainWindow(mainWindow); loadLayoutGetters(); nextLaytout(); diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java index 562a2176e2..cc275c18f4 100644 --- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java @@ -11,11 +11,12 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeButton; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; @SuppressWarnings("serial") public class ButtonsTest extends com.vaadin.Application.LegacyApplication { - final Root main = new Root("Button states & themes"); + final Root.LegacyWindow main = new LegacyWindow("Button states & themes"); CheckBox styleToggle; CheckBox iconToggle; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java index 87f9f4539a..08baf3cd86 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -20,7 +20,8 @@ public class Ticket1225 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app to break layout fuction in IE7"); + final LegacyWindow mainWin = new LegacyWindow( + "Test app to break layout fuction in IE7"); setMainWindow(mainWin); VerticalSplitPanel sp = new VerticalSplitPanel(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java index 2259516ffc..7cdbb1300e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; public class Ticket1230 extends Application.LegacyApplication { @@ -18,7 +18,7 @@ public class Ticket1230 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); GridLayout layout = new GridLayout(5, 5); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java index d7e3a4ba14..58e7041584 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket124 extends Application.LegacyApplication { @@ -16,7 +16,8 @@ public class Ticket124 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root("#124: Insert & remove row for GridLayout"); + LegacyWindow w = new LegacyWindow( + "#124: Insert & remove row for GridLayout"); setMainWindow(w); setTheme("tests-tickets"); // gl = new GridLayout(4, 4); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java index 6f86fc223e..7221bc0ce8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; @@ -17,8 +17,8 @@ public class Ticket1245 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); main.addComponent(new TreeExample()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java index 07640d7151..8431e48f5c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java @@ -4,7 +4,7 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1365 extends com.vaadin.Application.LegacyApplication @@ -16,8 +16,8 @@ public class Ticket1365 extends com.vaadin.Application.LegacyApplication @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); main.addComponent(f); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java index 801d1c027c..a1a5b449d1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; /** @@ -15,7 +15,7 @@ public class Ticket1368 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app to #1368"); + final LegacyWindow mainWin = new LegacyWindow("Test app to #1368"); setMainWindow(mainWin); t = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, 5); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java index ab272514e4..dfccf31956 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java @@ -10,18 +10,18 @@ import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; public class Ticket1397 extends Application.LegacyApplication { - Root main; + LegacyWindow main; @Override public void init() { setTheme("runo"); - main = new Root("PopupView test"); + main = new LegacyWindow("PopupView test"); setMainWindow(main); Panel panel = new Panel("PopupTest"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java index 28c8540072..7c0b336a43 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java @@ -11,7 +11,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -22,7 +22,8 @@ public class Ticket1435 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("ButtonPanel containing a table test"); + final LegacyWindow mainWin = new LegacyWindow( + "ButtonPanel containing a table test"); setMainWindow(mainWin); ((AbstractOrderedLayout) mainWin.getContent()).setSpacing(true); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java index c7da7ba9bd..a77da6e059 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1444 extends Application.LegacyApplication { @@ -10,7 +10,8 @@ public class Ticket1444 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app to break layout fuction in IE7"); + final LegacyWindow mainWin = new LegacyWindow( + "Test app to break layout fuction in IE7"); setMainWindow(mainWin); VerticalLayout ol = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index 55530ec51b..9459c7cc85 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -6,6 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Window; public class Ticket1465ModalNotification extends Application.LegacyApplication { @@ -13,7 +14,8 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("ButtonPanel containing a table test"); + final LegacyWindow mainWin = new LegacyWindow( + "ButtonPanel containing a table test"); setMainWindow(mainWin); final Window modal = new Window("Modal window"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java index 2fdcc536b5..1c4156d7ff 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket1519 extends Application.LegacyApplication { @@ -10,7 +10,7 @@ public class Ticket1519 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app to #1519"); + final LegacyWindow mainWin = new LegacyWindow("Test app to #1519"); setMainWindow(mainWin); setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java index 043de07afb..4b031175f8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java @@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1572 extends com.vaadin.Application.LegacyApplication { @@ -17,8 +17,8 @@ public class Ticket1572 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); Panel p = new Panel("Test wrapper for gridlayout margin/spacing"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java index 9a9edcb9b2..1ff0d71c14 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.ProgressIndicator; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1581 extends com.vaadin.Application.LegacyApplication { @@ -17,8 +17,8 @@ public class Ticket1581 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); main.addComponent(new Label("Test the second issue in ticket #1581")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java index 08116cdcd7..b57636e97d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java @@ -17,13 +17,13 @@ import com.vaadin.terminal.RequestHandler; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.Link; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1589 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); MyDynamicResource res = new MyDynamicResource(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java index 16fa5df23b..0faf9b8afb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java @@ -8,11 +8,11 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1598 extends Application.LegacyApplication { - Root main = new Root("MenuBar test"); + LegacyWindow main = new LegacyWindow("MenuBar test"); final MenuBar menuBar = new MenuBar(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java index 0abf7597e7..1819076b32 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java @@ -5,7 +5,7 @@ import com.vaadin.data.Container; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; /** @@ -17,7 +17,7 @@ public class Ticket161 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app to #1368"); + final LegacyWindow mainWin = new LegacyWindow("Test app to #1368"); setMainWindow(mainWin); t = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, 100); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java index 643642bf0f..1774000355 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; /** @@ -16,7 +16,7 @@ public class Ticket1632 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app"); + final LegacyWindow mainWin = new LegacyWindow("Test app"); setMainWindow(mainWin); t = new Table(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java index 290bd80ce6..d78a1d78af 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java @@ -4,13 +4,13 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1659 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root(); + final LegacyWindow mainWin = new LegacyWindow(); setMainWindow(mainWin); mainWin.addComponent(new Button( "Change URI using Application.getURL()", @@ -25,7 +25,7 @@ public class Ticket1659 extends Application.LegacyApplication { new Button.ClickListener() { public void buttonClick(ClickEvent event) { - mainWin.open(new ExternalResource(getWindowUrl(mainWin) + mainWin.open(new ExternalResource(mainWin.getURL() + "#" + System.currentTimeMillis())); } })); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java index 72970fc6aa..3449fe1dba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.terminal.SystemError; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1663 extends com.vaadin.Application.LegacyApplication { @@ -9,7 +9,7 @@ public class Ticket1663 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - Root main = new Root("#1663"); + LegacyWindow main = new LegacyWindow("#1663"); setMainWindow(main); TextField tf = new TextField("First name"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java index 96cfd7cfdc..750775b5fe 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java @@ -3,14 +3,14 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1673 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#1673"); + final LegacyWindow main = new LegacyWindow("#1673"); setMainWindow(main); main.addComponent(new Button("close", new Button.ClickListener() { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java index d30b24796b..643c7f5adc 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java @@ -21,7 +21,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -33,7 +33,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { setTheme("tests-tickets"); VerticalLayout lo = new VerticalLayout(); - setMainWindow(new Root("#1710", lo)); + setMainWindow(new LegacyWindow("#1710", lo)); lo.setMargin(true); lo.setSpacing(true); lo.setWidth("100%"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java index 25461c4af2..ccd649c542 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java @@ -7,7 +7,7 @@ import com.vaadin.terminal.Resource; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1737 extends Application.LegacyApplication { @@ -28,8 +28,8 @@ public class Ticket1737 extends Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); VerticalLayout el = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java index e2fbecb779..953dd5c288 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java @@ -1,15 +1,15 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1767 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); ComboBox cb = new ComboBox(" '<' item is not seen in populist?"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java index 96b7af25d7..7e5f81661c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1772 extends com.vaadin.Application.LegacyApplication { @@ -11,8 +11,8 @@ public class Ticket1772 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); Button b = new Button("Add content"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java index efb22d8273..f946b65874 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java @@ -4,14 +4,14 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1775 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#1775"); + final LegacyWindow main = new LegacyWindow("#1775"); setMainWindow(main); setTheme("tests-tickets"); String layoutName = "Ticket1775"; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java index 3fa5129b2a..af85779d1e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java @@ -10,7 +10,7 @@ import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; @@ -21,7 +21,7 @@ public class Ticket1804 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#1804"); + final LegacyWindow main = new LegacyWindow("#1804"); setMainWindow(main); com.vaadin.ui.Select s; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java index 9c7ec702f8..d847fda1ba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java @@ -7,15 +7,15 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1805 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); ((Layout) main.getContent()).setMargin(false); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java index ec8c4455a7..046c8330f1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java @@ -3,15 +3,15 @@ package com.vaadin.tests.tickets; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1806 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); final ObjectProperty prop = new ObjectProperty(""); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java index 2280635250..e61715cab8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java @@ -8,7 +8,7 @@ import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -19,7 +19,7 @@ public class Ticket1811 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#1811"); + final LegacyWindow main = new LegacyWindow("#1811"); setMainWindow(main); Validator strLenValidator = new StringLengthValidator( diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java index 9ec954e51f..993396bdde 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java @@ -7,7 +7,7 @@ import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; @@ -18,7 +18,7 @@ public class Ticket1819 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#1819"); + final LegacyWindow main = new LegacyWindow("#1819"); setMainWindow(main); com.vaadin.ui.Select s; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 06eea85b99..11612015a0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1834PanelScrolling extends com.vaadin.Application.LegacyApplication { @@ -19,8 +19,8 @@ public class Ticket1834PanelScrolling extends @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); HorizontalLayout currentState = new HorizontalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java index eca322faf6..2af5bf9c85 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java @@ -7,7 +7,7 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -20,7 +20,7 @@ public class Ticket1857 extends Application.LegacyApplication implements setTheme("tests-tickets"); VerticalLayout el = new VerticalLayout(); - Root main = new Root("Testcase for #1857", el); + LegacyWindow main = new LegacyWindow("Testcase for #1857", el); setMainWindow(main); el.setMargin(true); el.setSpacing(true); @@ -42,7 +42,7 @@ public class Ticket1857 extends Application.LegacyApplication implements actionHandlerEnabler.setImmediate(true); actionHandlerEnabler.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - if (((Boolean) actionHandlerEnabler.getValue()).booleanValue()) { + if (actionHandlerEnabler.getValue().booleanValue()) { t.addActionHandler(Ticket1857.this); } else { t.removeActionHandler(Ticket1857.this); @@ -55,7 +55,7 @@ public class Ticket1857 extends Application.LegacyApplication implements cellStylesEnabler.setImmediate(true); cellStylesEnabler.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - if (((Boolean) cellStylesEnabler.getValue()).booleanValue()) { + if (cellStylesEnabler.getValue().booleanValue()) { t.setCellStyleGenerator(new Table.CellStyleGenerator() { public String getStyle(Object itemId, Object propertyId) { Object cell = t.getContainerProperty(itemId, diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java index 3b12d8dd67..3a7b368097 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java @@ -1,14 +1,14 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1868 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root("#1868")); + setMainWindow(new LegacyWindow("#1868")); Panel p = new Panel( "This is a really long caption for the panel, too long in fact!"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java index ef5379206d..0ba4ffee9e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java @@ -4,7 +4,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1869 extends com.vaadin.Application.LegacyApplication { @@ -13,7 +13,7 @@ public class Ticket1869 extends com.vaadin.Application.LegacyApplication { public void init() { GridLayout lo = new GridLayout(2, 1); - setMainWindow(new Root("#1869", lo)); + setMainWindow(new LegacyWindow("#1869", lo)); lo.setMargin(true); lo.setSpacing(true); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java index 2732b04d15..812e220cbb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java @@ -23,7 +23,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -39,7 +39,7 @@ public class Ticket1878 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java index 5462ae4ce9..fdbecf8eae 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java @@ -4,13 +4,13 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1900 extends Application.LegacyApplication { TextField f[] = new TextField[5]; - Root main = new Root("#1900 test"); + LegacyWindow main = new LegacyWindow("#1900 test"); @Override public void init() { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java index a16794f109..2837d71e67 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java @@ -5,14 +5,14 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1904 extends Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root("#1904")); + setMainWindow(new LegacyWindow("#1904")); setTheme("tests-tickets"); addOL("defaults", null, false); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java index 2e54a088c3..790d3aa931 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket1916 extends Application.LegacyApplication { @@ -21,7 +21,7 @@ public class Ticket1916 extends Application.LegacyApplication { test.addComponent(tf); test.setComponentAlignment(tf, Alignment.MIDDLE_CENTER); - Root w = new Root("Test #1916", test); + LegacyWindow w = new LegacyWindow("Test #1916", test); setMainWindow(w); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java index fcda39c942..1c2cdc08b8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1919 extends com.vaadin.Application.LegacyApplication { @@ -14,8 +14,8 @@ public class Ticket1919 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java index b4cec88133..c0a1c7d2c9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java @@ -10,7 +10,7 @@ import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1921 extends Application.LegacyApplication implements @@ -25,7 +25,7 @@ public class Ticket1921 extends Application.LegacyApplication implements public void init() { outer = new VerticalLayout(); - setMainWindow(new Root("#1921", outer)); + setMainWindow(new LegacyWindow("#1921", outer)); setTheme("tests-tickets"); inner = new VerticalLayout(); outer.addComponent(inner); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java index 66aa3711c8..c549da7cbb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1923 extends com.vaadin.Application.LegacyApplication { @@ -13,8 +13,8 @@ public class Ticket1923 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); p = new Panel("TestPanel 250x300"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java index 7313a4e307..41e2987da0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1925 extends Application.LegacyApplication { @Override public void init() { - Root mainWindow = new Root("Test åäö"); + LegacyWindow mainWindow = new LegacyWindow("Test åäö"); setMainWindow(mainWindow); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java index 14acb19590..d24cace2c9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -11,7 +11,7 @@ public class Ticket1939 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); final VerticalLayout l = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java index 17c6004d6d..10eebe4cba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -9,7 +9,7 @@ public class Ticket1940 extends Application.LegacyApplication { @Override public void init() { - final Root w = new Root(getClass().getName()); + final LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); final VerticalLayout l = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java index 77ab60cae4..a832401cd0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1953 extends Application.LegacyApplication { public static final String cellStyle = "test-cell"; @@ -16,8 +16,8 @@ public class Ticket1953 extends Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); setTheme("tests-tickets"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java index 72de8d3377..9b73d6d084 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java @@ -9,14 +9,14 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); // setTheme("tests-tickets"); w.setContent(new GridLayout(2, 2)); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java index a13d19815d..84c6cb4286 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java @@ -9,14 +9,14 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket1966_2 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); w.setContent(new GridLayout(2, 2)); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java index 11f42c1df4..d20c9551ef 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java @@ -6,7 +6,7 @@ import com.vaadin.terminal.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -14,7 +14,7 @@ public class Ticket1966_3 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java index 0ad994c1f8..62cfc6ee3c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java @@ -5,7 +5,7 @@ import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -14,8 +14,8 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); main.getContent().setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java index 0c587ce8c9..f826e1d1b7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java @@ -6,7 +6,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1970 extends Application.LegacyApplication { @@ -16,10 +16,10 @@ public class Ticket1970 extends Application.LegacyApplication { } @Override - public Root getWindow(String name) { + public LegacyWindow getWindow(String name) { // If we already have the requested window, use it - Root w = super.getWindow(name); + LegacyWindow w = super.getWindow(name); if (w == null) { // If no window found, create it @@ -28,9 +28,10 @@ public class Ticket1970 extends Application.LegacyApplication { return w; } - private Root createExtraWindow(String name) { - final Root w = new Root("Extra window: " + name); - addWindow(w, name); + private LegacyWindow createExtraWindow(String name) { + final LegacyWindow w = new LegacyWindow("Extra window: " + name); + w.setName(name); + addWindow(w); w.addComponent(new Label( "This window has been created on fly for name: " + name)); w.addComponent(new Button("Show open windows", @@ -38,11 +39,11 @@ public class Ticket1970 extends Application.LegacyApplication { public void buttonClick(ClickEvent event) { String openWindows = ""; - for (Iterator i = getWindows().iterator(); i + for (Iterator i = getWindows().iterator(); i .hasNext();) { - Root t = i.next(); + LegacyWindow t = i.next(); openWindows += (openWindows.length() > 0 ? "," : "") - + getWindowName(t); + + t.getName(); } w.showNotification(openWindows); } @@ -51,13 +52,13 @@ public class Ticket1970 extends Application.LegacyApplication { return w; } - private Root createWindow() { - final Root w = new Root(); + private LegacyWindow createWindow() { + final LegacyWindow w = new LegacyWindow(); w.addComponent(new Button("Show the name of the application", new Button.ClickListener() { public void buttonClick(ClickEvent event) { w.showNotification("Name of this window = " - + getWindowName(w)); + + w.getName()); } })); w.addComponent(new Label("" diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java index fb94cfdd1d..71ed121b56 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java @@ -3,13 +3,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1972 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); setTheme("tests-ticket"); GridLayout layout = new GridLayout(3, 3); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java index ccbe17f9dc..3cf7acb956 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java @@ -4,13 +4,13 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; public class Ticket1973 extends com.vaadin.Application.LegacyApplication { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); Table table = new Table(); @Override diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java index 8acad5d1b1..d43aac9da0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java @@ -5,12 +5,12 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; public class Ticket1973_2 extends Application.LegacyApplication { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); Table table = new Table(); @Override diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java index 76bd1ebfcc..079a26c164 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1975 extends Application.LegacyApplication { @@ -20,7 +20,7 @@ public class Ticket1975 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); setTheme("tests-tickets"); GridLayout layout = new GridLayout(1, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java index 5f314c3073..431c3a6b99 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java @@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket1982 extends Application.LegacyApplication { @@ -18,7 +18,7 @@ public class Ticket1982 extends Application.LegacyApplication { @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); GridLayout gl = new GridLayout(2, 2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java index 60c7e07da7..c68ccf08f9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; @@ -20,7 +20,7 @@ public class Ticket1983 extends Application.LegacyApplication { @Override public void init() { - Root main = new Root("Test for ticket 1983"); + LegacyWindow main = new LegacyWindow("Test for ticket 1983"); main.setContent(new TestLayout()); setMainWindow(main); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java index 3f9a327e39..9b55c273b1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java @@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.ListSelect; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.TwinColSelect; @@ -16,7 +16,7 @@ public class Ticket1986 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); int index = 1; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java index 94ea289356..11ae0fc928 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java @@ -1,15 +1,15 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class Ticket1991 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); Table t = new Table("Test table"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java index 089b019a66..19c1fd7a03 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java @@ -7,7 +7,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.filter.SimpleStringFilter; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; public class Ticket1995 extends Application.LegacyApplication { @@ -17,7 +17,7 @@ public class Ticket1995 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root(getClass().getName()); + final LegacyWindow mainWin = new LegacyWindow(getClass().getName()); setMainWindow(mainWin); table = new Table(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java index 0cc27b11f5..5c4779e69e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java @@ -8,7 +8,7 @@ import com.vaadin.data.validator.CompositeValidator.CombinationMode; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket20 extends Application.LegacyApplication { @@ -16,7 +16,7 @@ public class Ticket20 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app for #20"); + final LegacyWindow mainWin = new LegacyWindow("Test app for #20"); setMainWindow(mainWin); final TextField tx = new TextField("Integer"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java index 49dfe951c7..a14c881b85 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java @@ -5,14 +5,14 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2001 extends Application.LegacyApplication { @Override public void init() { - final Root w = new Root(getClass().getName()); + final LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); final VerticalLayout l = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java index 869e406220..db1ea45de9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2002 extends Application.LegacyApplication { @@ -28,7 +28,7 @@ public class Ticket2002 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); GridLayout layout = new GridLayout(2, 2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java index 1917f48438..6700267a25 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2007 extends Application.LegacyApplication { @@ -13,15 +13,15 @@ public class Ticket2007 extends Application.LegacyApplication { @Override public void init() { - final Root main = new Root("Main window for #2007"); + final LegacyWindow main = new LegacyWindow("Main window for #2007"); setMainWindow(main); main.addComponent(new Button("Open another (non-main) window", new Button.ClickListener() { public void buttonClick(ClickEvent event) { - Root c = new Root("Non-main browser window " - + (++childs)); + LegacyWindow c = new LegacyWindow( + "Non-main browser window " + (++childs)); addWindow(c); - main.open(new ExternalResource(getWindowUrl(c)), "_new"); + main.open(new ExternalResource(c.getURL()), "_new"); } })); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java index d40d9917c2..1e52c04b85 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; @@ -21,8 +21,8 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - final Root main = new Root(getClass().getName().substring( - getClass().getName().lastIndexOf(".") + 1)); + final LegacyWindow main = new LegacyWindow(getClass().getName() + .substring(getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); HorizontalLayout ol = new HorizontalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java index 2d070de507..f30c3cc884 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java @@ -2,14 +2,14 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Select; public class Ticket2011 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); // setTheme("tests-ticket"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java index 9ea03c0754..1096d1c437 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2014 extends Application.LegacyApplication { @@ -19,7 +19,7 @@ public class Ticket2014 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getName()); + LegacyWindow w = new LegacyWindow(getClass().getName()); setMainWindow(w); // setTheme("tests-ticket"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java index 6fc84a5a12..258114dbf0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java @@ -10,7 +10,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; @@ -26,7 +26,7 @@ public class Ticket2021 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); w.setContent(new GridLayout(2, 2)); setMainWindow(w); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java index bbda0382cd..2bc4a938f3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java @@ -2,13 +2,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2022 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); setTheme("tests-tickets"); CustomLayout l; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java index 118d507ff9..238561ef47 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java @@ -4,7 +4,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2023 extends com.vaadin.Application.LegacyApplication implements Button.ClickListener { @@ -13,7 +13,7 @@ public class Ticket2023 extends com.vaadin.Application.LegacyApplication @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); String[] sizes = { "20", "100", "1", "0", "-1", "", "z" }; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java index 2ef97c469a..ffb33f1162 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -11,7 +11,7 @@ public class Ticket2024 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(2, 2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java index f7bd9c9783..bb19659a35 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java @@ -2,14 +2,14 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2026 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); GridLayout layout = new GridLayout(2, 2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java index 8feb537f1a..eada8b1cf5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java @@ -11,7 +11,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -28,7 +28,7 @@ public class Ticket2029 extends Application.LegacyApplication { DIM1 = 504; DIM2 = 100; - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); Panel p = createPanel(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java index f4637ccb95..ff7cb694b5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java @@ -4,14 +4,14 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2037 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); main.addComponent(new Label( diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java index 4d28f7e36c..a5c102b988 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java @@ -5,14 +5,14 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2038 extends Application.LegacyApplication { @Override public void init() { - final Root w = new Root("Testing for #2038"); + final LegacyWindow w = new LegacyWindow("Testing for #2038"); setMainWindow(w); final TextField tf = new TextField( diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java index 5737e08653..647921b1fa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.Accordion; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; @@ -13,7 +13,7 @@ public class Ticket2040 extends com.vaadin.Application.LegacyApplication { @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); main.getContent().setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java index 3306353ab4..50f1e0dfb3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java @@ -7,13 +7,13 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2042 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(1, 2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java index 80eb7d9abd..056af36b44 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java @@ -4,13 +4,13 @@ import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Link; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2043 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java index 4a25a35b0d..a194c79953 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java @@ -10,7 +10,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; public class Ticket2048 extends Application.LegacyApplication { @@ -21,7 +21,7 @@ public class Ticket2048 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); // splitPanel = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java index 953d5a36eb..e4d3b55e88 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; @@ -18,7 +18,7 @@ public class Ticket2051 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java index c9ceef461a..a2ff1816e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java @@ -7,7 +7,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2053 extends Application.LegacyApplication { @@ -17,7 +17,7 @@ public class Ticket2053 extends Application.LegacyApplication { @Override public void init() { - final Root main = new Root("#2053"); + final LegacyWindow main = new LegacyWindow("#2053"); setMainWindow(main); Button nothing = new Button("Do nothing"); main.addComponent(nothing); @@ -27,10 +27,10 @@ public class Ticket2053 extends Application.LegacyApplication { Button add = new Button("Add a window", new Button.ClickListener() { public void buttonClick(ClickEvent event) { final String name = "Child " + (++childs); - Root c = new Root(name); + LegacyWindow c = new LegacyWindow(name); addWindow(c); - main.open(new ExternalResource(getWindowUrl(c)), "_new"); + main.open(new ExternalResource(c.getURL()), "_new"); main.addComponent(new Label(name + " opened")); final TextField tf = new TextField("Non immediate textfield"); c.addComponent(tf); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java index 5e0c6d2669..2d7662f65e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2060 extends Application.LegacyApplication { @@ -16,7 +16,7 @@ public class Ticket2060 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java index 01d014570f..0881d141cb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java @@ -8,18 +8,18 @@ import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; public class Ticket2061 extends Application.LegacyApplication { - private Root mainWindow; + private LegacyWindow mainWindow; @Override public void init() { - mainWindow = new Root("Ticket 2061"); + mainWindow = new LegacyWindow("Ticket 2061"); mainWindow.setSizeFull(); mainWindow.getContent().setSizeFull(); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java index b293a325e6..98badf36e8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; @@ -24,12 +24,12 @@ import com.vaadin.ui.VerticalSplitPanel; public class Ticket2061b extends Application.LegacyApplication implements SelectedTabChangeListener { - private Root mainWindow; + private LegacyWindow mainWindow; private Panel p; @Override public void init() { - mainWindow = new Root("Ticket 2061b"); + mainWindow = new LegacyWindow("Ticket 2061b"); mainWindow.setSizeFull(); AbstractOrderedLayout mainLayout = (AbstractOrderedLayout) mainWindow .getContent(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java index 5988b31c5d..a8188a4913 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java @@ -10,7 +10,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; @@ -20,12 +20,12 @@ import com.vaadin.ui.VerticalLayout; public class Ticket2061c extends Application.LegacyApplication implements SelectedTabChangeListener { - private Root mainWindow; + private LegacyWindow mainWindow; private Panel p; @Override public void init() { - mainWindow = new Root("Vaadin"); + mainWindow = new LegacyWindow("Vaadin"); mainWindow.setSizeFull(); mainWindow.getContent().setSizeFull(); setMainWindow(mainWindow); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java index 8e5adc0eb3..278e6de03e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; @@ -12,7 +12,7 @@ public class Ticket2062 extends Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root("Ticket2062")); + setMainWindow(new LegacyWindow("Ticket2062")); getMainWindow().setSizeFull(); HorizontalSplitPanel p = new HorizontalSplitPanel(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java index f2055f0e80..4b6fcab3f5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java @@ -4,13 +4,13 @@ import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2083 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java index 6ee6272d91..de89f1baec 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java @@ -7,14 +7,14 @@ import com.vaadin.terminal.Sizeable; import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2090 extends Application.LegacyApplication { Label label = new Label(); Button target = new Button(); - Root w = new Root("#2090"); + LegacyWindow w = new LegacyWindow("#2090"); @Override public void init() { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java index c473f7c6ca..1d55437e93 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java @@ -3,13 +3,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Embedded; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2095 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // uncomment to workaround iorderedlayout bug in current trunk diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java index 8910591386..7d13e3d805 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; public class Ticket2098 extends Application.LegacyApplication { @@ -11,14 +11,14 @@ public class Ticket2098 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); w.addComponent(new Label(info)); createUI(w); } - private void createUI(Root w) { + private void createUI(LegacyWindow w) { TabSheet ts = new TabSheet(); Label l1 = new Label("111"); Label l2 = new Label("222"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java index 47a2b012c9..22f104606a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -19,7 +19,7 @@ public class Ticket2099 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); // setTheme("tests-tickets"); GridLayout layout = new GridLayout(10, 10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java index f245f3b16d..113a60a1d8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java @@ -2,13 +2,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2101 extends Application.LegacyApplication { @Override public void init() { - Root w = new Root(getClass().getSimpleName()); + LegacyWindow w = new LegacyWindow(getClass().getSimpleName()); setMainWindow(w); Button b = new Button( diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java index 5ddfce7498..1fb89eebc4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java @@ -5,16 +5,16 @@ import com.vaadin.data.Item; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; public class Ticket2103 extends Application.LegacyApplication { - private Root mainWindow; + private LegacyWindow mainWindow; @Override public void init() { - mainWindow = new Root(getClass().getSimpleName()); + mainWindow = new LegacyWindow(getClass().getSimpleName()); mainWindow.setContent(new VerticalLayout()); mainWindow.setSizeFull(); mainWindow.getContent().setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java index 7d592c334b..71d36f0d4c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java @@ -10,7 +10,7 @@ import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; @@ -25,7 +25,7 @@ public class Ticket2104 extends Application.LegacyApplication { @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); main.addComponent(info); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java index 9548deecfc..0776f6c4a6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java @@ -6,7 +6,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2106 extends Application.LegacyApplication { @@ -24,7 +24,7 @@ public class Ticket2106 extends Application.LegacyApplication { @Override public void init() { - setMainWindow(new Root("#2106")); + setMainWindow(new LegacyWindow("#2106")); getMainWindow().addComponent( new Button("Do nothing", new Button.ClickListener() { public void buttonClick(ClickEvent event) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java index 84a12cda1e..57926143eb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java @@ -6,14 +6,14 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Notification; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket2107 extends Application.LegacyApplication { @Override public void init() { - final Root w = new Root("Testing for #2107"); + final LegacyWindow w = new LegacyWindow("Testing for #2107"); setMainWindow(w); final TextField tf = new TextField( @@ -47,7 +47,7 @@ public class Ticket2107 extends Application.LegacyApplication { b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - tf.setRequiredError((Boolean) b.getValue() ? "Field must not be empty" + tf.setRequiredError(b.getValue() ? "Field must not be empty" : null); } }); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java index 10a1ef193e..1991f229b7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket2117 extends Application.LegacyApplication { @@ -16,26 +16,27 @@ public class Ticket2117 extends Application.LegacyApplication { } @Override - public Root getWindow(String name) { + public LegacyWindow getWindow(String name) { // If we already have the requested window, use it - Root w = super.getWindow(name); + LegacyWindow w = super.getWindow(name); if (w == null) { // If no window found, create it w = createExtraWindow(name); - w.open(new ExternalResource(getWindowUrl(w))); + w.open(new ExternalResource(w.getURL())); } return w; } - private Root createExtraWindow(String name) { - final Root w = new Root("Extra window: " + name); - addWindow(w, name); + private LegacyWindow createExtraWindow(String name) { + final LegacyWindow w = new LegacyWindow("Extra window: " + name); + w.setName(name); + addWindow(w); w.addComponent(new Label( "This window has been created on fly for name: " + name)); - w.addComponent(new Label("It has also been redirected to " - + getWindowUrl(w) + " to support reloading")); + w.addComponent(new Label("It has also been redirected to " + w.getURL() + + " to support reloading")); w.addComponent(new Button("button", new ClickListener() { public void buttonClick(ClickEvent event) { w.showNotification("Button clicked"); @@ -45,8 +46,8 @@ public class Ticket2117 extends Application.LegacyApplication { return w; } - private Root createWindow() { - final Root w = new Root(); + private LegacyWindow createWindow() { + final LegacyWindow w = new LegacyWindow(); w.addComponent(new Label( "Click this link: "+ - ""+ - " "+ - " x"+ - " 2"+ - " "+ - " "+ - " c"+ - " 2"+ - " "+ - " "+ - ""; + + String mathml = "" + + "" + + " " + + " x" + + " 2" + + " " + + " " + + " c" + + " 2" + + " " + + " " + ""; Label mathLabel = new Label(mathml, Label.CONTENT_XML); mainWindow.addComponent(mathLabel); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java index 841e76fa7a..7037a1e111 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java @@ -5,7 +5,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -13,7 +13,7 @@ public class Ticket6002 extends TestBase { @Override public void setup() { - Root main = new Root("The Main Window"); + LegacyWindow main = new LegacyWindow("The Main Window"); setMainWindow(main); final VerticalLayout mainLayout = new VerticalLayout(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java index a739c2dc7c..2b48ab2dc3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java @@ -16,7 +16,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; @@ -40,7 +40,7 @@ public class Ticket677 extends Application.LegacyApplication { @Override public void init() { - Root main = new Root(); + LegacyWindow main = new LegacyWindow(); setMainWindow(main); main.addComponent(info); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java index 5afc749059..11d643cd52 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java @@ -7,14 +7,14 @@ import java.io.ObjectOutputStream; import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; @SuppressWarnings("serial") public class Ticket695 extends Application.LegacyApplication { @Override public void init() { - final Root w = new Root("Serialization test #695"); + final LegacyWindow w = new LegacyWindow("Serialization test #695"); setMainWindow(w); Button b = new Button("Serialize ApplicationContext"); w.addComponent(b); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java index 7fb3b6f56f..48bd29fcc5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java @@ -15,7 +15,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; public class Ticket736 extends Application.LegacyApplication { @@ -24,7 +24,7 @@ public class Ticket736 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app for #736"); + final LegacyWindow mainWin = new LegacyWindow("Test app for #736"); setMainWindow(mainWin); setTheme("runo"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java index 44b2a364c5..714b3c21ca 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java @@ -5,7 +5,7 @@ import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; public class Ticket846 extends Application.LegacyApplication { @@ -13,7 +13,7 @@ public class Ticket846 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app for #846"); + final LegacyWindow mainWin = new LegacyWindow("Test app for #846"); setMainWindow(mainWin); final TextField tx = new TextField("Integer"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java index db12447892..bf6f6d1879 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; @@ -13,7 +13,8 @@ public class Ticket932 extends Application.LegacyApplication { @Override public void init() { - final Root mainWin = new Root("Test app for max length feature"); + final LegacyWindow mainWin = new LegacyWindow( + "Test app for max length feature"); setMainWindow(mainWin); final TextField tx = new TextField( diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java index f1292680dc..e18b8ffd4e 100644 --- a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java +++ b/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java @@ -2,7 +2,7 @@ package com.vaadin.tests.validation; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Form; -import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -21,7 +21,7 @@ public class RequiredErrorMessage extends TestBase { @Override public void setup() { - final Root main = new Root(getClass().getName()); + final LegacyWindow main = new LegacyWindow(getClass().getName()); setMainWindow(main); final Form form = new Form(new VerticalLayout()); -- 2.39.5