From: Leif Åstrand Date: Wed, 5 Sep 2012 16:32:27 +0000 (+0300) Subject: Rename LegacyApplication -> Application (#9402) X-Git-Tag: 7.0.0.beta1~184^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4019f7d03a1d8437a24ccadc562c30f99da5efe0;p=vaadin-framework.git Rename LegacyApplication -> Application (#9402) --- diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java new file mode 100644 index 0000000000..13ce23d1e4 --- /dev/null +++ b/server/src/com/vaadin/Application.java @@ -0,0 +1,302 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin; + +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.vaadin.server.AbstractUIProvider; +import com.vaadin.server.VaadinSession; +import com.vaadin.server.Terminal.ErrorEvent; +import com.vaadin.server.Terminal.ErrorListener; +import com.vaadin.server.WrappedRequest; +import com.vaadin.ui.UI; + +/** + * A special application designed to help migrating applications from Vaadin 6 + * to Vaadin 7. The legacy application supports setting a main window, adding + * additional browser level windows and defining the theme for the entire + * application. + * + * @deprecated This class is only intended to ease migration and should not be + * used for new projects. + * + * @since 7.0 + */ +@Deprecated +public abstract class Application extends AbstractUIProvider implements + ErrorListener { + /** + * Ignore initial / and then get everything up to the next / + */ + private static final Pattern WINDOW_NAME_PATTERN = Pattern + .compile("^/?([^/]+).*"); + + private UI.LegacyWindow mainWindow; + private String theme; + + private Map legacyUINames = new HashMap(); + + /** + * Sets the main window of this application. Setting window as a main window + * of this application also adds the window to this application. + * + * @param mainWindow + * the UI to set as the default window + */ + public void setMainWindow(UI.LegacyWindow mainWindow) { + if (this.mainWindow != null) { + throw new IllegalStateException("mainWindow has already been set"); + } + if (mainWindow.getSession() == null) { + mainWindow.setSession(VaadinSession.getCurrent()); + } else if (mainWindow.getSession() != VaadinSession.getCurrent()) { + throw new IllegalStateException( + "mainWindow is attached to another application"); + } + if (UI.getCurrent() == null) { + // Assume setting a main window from Application.init if there's + // no current UI -> set the main window as the current UI + UI.setCurrent(mainWindow); + } + this.mainWindow = mainWindow; + } + + public void doInit() { + VaadinSession.getCurrent().setErrorHandler(this); + init(); + } + + protected abstract void init(); + + @Override + public Class getUIClass(VaadinSession application, + WrappedRequest request) { + UI uiInstance = getUIInstance(request); + if (uiInstance != null) { + return uiInstance.getClass(); + } + return null; + } + + @Override + public UI createInstance(VaadinSession application, Class type, + WrappedRequest request) { + return getUIInstance(request); + } + + @Override + public String getThemeForUI(WrappedRequest request, + Class uiClass) { + return theme; + } + + @Override + public String getPageTitleForUI(WrappedRequest request, + Class uiClass) { + UI uiInstance = getUIInstance(request); + if (uiInstance != null) { + return uiInstance.getCaption(); + } else { + return super.getPageTitleForUI(request, uiClass); + } + } + + /** + * Gets the mainWindow of the application. + * + *

+ * The main window is the window attached to the application URL ( + * {@link #getURL()}) and thus which is show by default to the user. + *

+ *

+ * Note that each application must have at least one main window. + *

+ * + * @return the UI used as the default window + */ + public UI.LegacyWindow getMainWindow() { + return mainWindow; + } + + private UI getUIInstance(WrappedRequest request) { + String pathInfo = request.getRequestPathInfo(); + String name = null; + if (pathInfo != null && pathInfo.length() > 0) { + Matcher matcher = WINDOW_NAME_PATTERN.matcher(pathInfo); + if (matcher.matches()) { + // Skip the initial slash + name = matcher.group(1); + } + } + UI.LegacyWindow window = getWindow(name); + if (window != null) { + return window; + } + return mainWindow; + } + + /** + * This implementation simulates the way of finding a window for a request + * by extracting a window name from the requested path and passes that name + * to {@link #getWindow(String)}. + *

+ * {@inheritDoc} + */ + @Override + public UI getExistingUI(WrappedRequest request) { + UI uiInstance = getUIInstance(request); + if (uiInstance.getUIId() == -1) { + // Not initialized -> Let go through createUIInstance to make it + // initialized + return null; + } else { + UI.setCurrent(uiInstance); + return uiInstance; + } + } + + /** + * Sets the application's theme. + *

+ * Note that this theme can be overridden for a specific UI with + * {@link VaadinSession#getThemeForUI(UI)}. Setting theme to be + * null selects the default theme. For the available theme + * names, see the contents of the VAADIN/themes directory. + *

+ * + * @param theme + * the new theme for this application. + */ + public void setTheme(String theme) { + this.theme = theme; + } + + /** + * Gets the application's theme. The application's theme is the default + * theme used by all the uIs for which a theme is not explicitly defined. If + * the application theme is not explicitly set, null is + * returned. + * + * @return the name of the application's theme. + */ + public String getTheme() { + return theme; + } + + /** + *

+ * Gets a UI by name. Returns null if the application is not + * running or it does not contain a window corresponding to the name. + *

+ * + * @param name + * the name of the requested window + * @return a UI corresponding to the name, or null to use the + * default window + */ + public UI.LegacyWindow getWindow(String name) { + return legacyUINames.get(name); + } + + /** + * Counter to get unique names for windows with no explicit name + */ + private int namelessUIIndex = 0; + + /** + * Adds a new browser level window to this application. Please note that UI + * doesn't have a name that is used in the URL - to add a named window you + * should instead use {@link #addWindow(UI, String)} + * + * @param uI + * the UI window to add to the application + * @return returns the name that has been assigned to the window + * + * @see #addWindow(UI, String) + */ + public void addWindow(UI.LegacyWindow uI) { + if (uI.getName() == null) { + String name = Integer.toString(namelessUIIndex++); + uI.setName(name); + } + + legacyUINames.put(uI.getName(), uI); + uI.setSession(VaadinSession.getCurrent()); + } + + /** + * Removes the specified window from the application. This also removes all + * name mappings for the window (see {@link #addWindow(UI, String) and + * #getWindowName(UI)}. + * + *

+ * Note that removing window from the application does not close the browser + * window - the window is only removed from the server-side. + *

+ * + * @param uI + * the UI to remove + */ + public void removeWindow(UI.LegacyWindow uI) { + for (Entry entry : legacyUINames.entrySet()) { + if (entry.getValue() == uI) { + legacyUINames.remove(entry.getKey()); + } + } + } + + /** + * Gets the set of windows contained by the application. + * + *

+ * Note that the returned set of windows can not be modified. + *

+ * + * @return the unmodifiable collection of windows. + */ + public Collection getWindows() { + return Collections.unmodifiableCollection(legacyUINames.values()); + } + + @Override + public void terminalError(ErrorEvent event) { + VaadinSession.getCurrent().terminalError(event); + } + + public VaadinSession getContext() { + return VaadinSession.getCurrent(); + } + + protected void close() { + VaadinSession.getCurrent().close(); + } + + public boolean isRunning() { + return VaadinSession.getCurrent().isRunning(); + } + + public URL getURL() { + return VaadinSession.getCurrent().getURL(); + } +} \ No newline at end of file diff --git a/server/src/com/vaadin/LegacyApplication.java b/server/src/com/vaadin/LegacyApplication.java deleted file mode 100644 index 66b2ca3973..0000000000 --- a/server/src/com/vaadin/LegacyApplication.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright 2011 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin; - -import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.vaadin.server.AbstractUIProvider; -import com.vaadin.server.VaadinSession; -import com.vaadin.server.Terminal.ErrorEvent; -import com.vaadin.server.Terminal.ErrorListener; -import com.vaadin.server.WrappedRequest; -import com.vaadin.ui.UI; - -/** - * A special application designed to help migrating applications from Vaadin 6 - * to Vaadin 7. The legacy application supports setting a main window, adding - * additional browser level windows and defining the theme for the entire - * application. - * - * @deprecated This class is only intended to ease migration and should not be - * used for new projects. - * - * @since 7.0 - */ -@Deprecated -public abstract class LegacyApplication extends AbstractUIProvider implements - ErrorListener { - /** - * Ignore initial / and then get everything up to the next / - */ - private static final Pattern WINDOW_NAME_PATTERN = Pattern - .compile("^/?([^/]+).*"); - - private UI.LegacyWindow mainWindow; - private String theme; - - private Map legacyUINames = new HashMap(); - - /** - * Sets the main window of this application. Setting window as a main window - * of this application also adds the window to this application. - * - * @param mainWindow - * the UI to set as the default window - */ - public void setMainWindow(UI.LegacyWindow mainWindow) { - if (this.mainWindow != null) { - throw new IllegalStateException("mainWindow has already been set"); - } - if (mainWindow.getSession() == null) { - mainWindow.setSession(VaadinSession.getCurrent()); - } else if (mainWindow.getSession() != VaadinSession.getCurrent()) { - throw new IllegalStateException( - "mainWindow is attached to another application"); - } - if (UI.getCurrent() == null) { - // Assume setting a main window from Application.init if there's - // no current UI -> set the main window as the current UI - UI.setCurrent(mainWindow); - } - this.mainWindow = mainWindow; - } - - public void doInit() { - VaadinSession.getCurrent().setErrorHandler(this); - init(); - } - - protected abstract void init(); - - @Override - public Class getUIClass(VaadinSession application, - WrappedRequest request) { - UI uiInstance = getUIInstance(request); - if (uiInstance != null) { - return uiInstance.getClass(); - } - return null; - } - - @Override - public UI createInstance(VaadinSession application, Class type, - WrappedRequest request) { - return getUIInstance(request); - } - - @Override - public String getThemeForUI(WrappedRequest request, - Class uiClass) { - return theme; - } - - @Override - public String getPageTitleForUI(WrappedRequest request, - Class uiClass) { - UI uiInstance = getUIInstance(request); - if (uiInstance != null) { - return uiInstance.getCaption(); - } else { - return super.getPageTitleForUI(request, uiClass); - } - } - - /** - * Gets the mainWindow of the application. - * - *

- * The main window is the window attached to the application URL ( - * {@link #getURL()}) and thus which is show by default to the user. - *

- *

- * Note that each application must have at least one main window. - *

- * - * @return the UI used as the default window - */ - public UI.LegacyWindow getMainWindow() { - return mainWindow; - } - - private UI getUIInstance(WrappedRequest request) { - String pathInfo = request.getRequestPathInfo(); - String name = null; - if (pathInfo != null && pathInfo.length() > 0) { - Matcher matcher = WINDOW_NAME_PATTERN.matcher(pathInfo); - if (matcher.matches()) { - // Skip the initial slash - name = matcher.group(1); - } - } - UI.LegacyWindow window = getWindow(name); - if (window != null) { - return window; - } - return mainWindow; - } - - /** - * This implementation simulates the way of finding a window for a request - * by extracting a window name from the requested path and passes that name - * to {@link #getWindow(String)}. - *

- * {@inheritDoc} - */ - @Override - public UI getExistingUI(WrappedRequest request) { - UI uiInstance = getUIInstance(request); - if (uiInstance.getUIId() == -1) { - // Not initialized -> Let go through createUIInstance to make it - // initialized - return null; - } else { - UI.setCurrent(uiInstance); - return uiInstance; - } - } - - /** - * Sets the application's theme. - *

- * Note that this theme can be overridden for a specific UI with - * {@link VaadinSession#getThemeForUI(UI)}. Setting theme to be - * null selects the default theme. For the available theme - * names, see the contents of the VAADIN/themes directory. - *

- * - * @param theme - * the new theme for this application. - */ - public void setTheme(String theme) { - this.theme = theme; - } - - /** - * Gets the application's theme. The application's theme is the default - * theme used by all the uIs for which a theme is not explicitly defined. If - * the application theme is not explicitly set, null is - * returned. - * - * @return the name of the application's theme. - */ - public String getTheme() { - return theme; - } - - /** - *

- * Gets a UI by name. Returns null if the application is not - * running or it does not contain a window corresponding to the name. - *

- * - * @param name - * the name of the requested window - * @return a UI corresponding to the name, or null to use the - * default window - */ - public UI.LegacyWindow getWindow(String name) { - return legacyUINames.get(name); - } - - /** - * Counter to get unique names for windows with no explicit name - */ - private int namelessUIIndex = 0; - - /** - * Adds a new browser level window to this application. Please note that UI - * doesn't have a name that is used in the URL - to add a named window you - * should instead use {@link #addWindow(UI, String)} - * - * @param uI - * the UI window to add to the application - * @return returns the name that has been assigned to the window - * - * @see #addWindow(UI, String) - */ - public void addWindow(UI.LegacyWindow uI) { - if (uI.getName() == null) { - String name = Integer.toString(namelessUIIndex++); - uI.setName(name); - } - - legacyUINames.put(uI.getName(), uI); - uI.setSession(VaadinSession.getCurrent()); - } - - /** - * Removes the specified window from the application. This also removes all - * name mappings for the window (see {@link #addWindow(UI, String) and - * #getWindowName(UI)}. - * - *

- * Note that removing window from the application does not close the browser - * window - the window is only removed from the server-side. - *

- * - * @param uI - * the UI to remove - */ - public void removeWindow(UI.LegacyWindow uI) { - for (Entry entry : legacyUINames.entrySet()) { - if (entry.getValue() == uI) { - legacyUINames.remove(entry.getKey()); - } - } - } - - /** - * Gets the set of windows contained by the application. - * - *

- * Note that the returned set of windows can not be modified. - *

- * - * @return the unmodifiable collection of windows. - */ - public Collection getWindows() { - return Collections.unmodifiableCollection(legacyUINames.values()); - } - - @Override - public void terminalError(ErrorEvent event) { - VaadinSession.getCurrent().terminalError(event); - } - - public VaadinSession getContext() { - return VaadinSession.getCurrent(); - } - - protected void close() { - VaadinSession.getCurrent().close(); - } - - public boolean isRunning() { - return VaadinSession.getCurrent().isRunning(); - } - - public URL getURL() { - return VaadinSession.getCurrent().getURL(); - } -} \ No newline at end of file diff --git a/server/src/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/com/vaadin/server/LegacyVaadinPortlet.java index 6efd9b29b3..f436cbb624 100644 --- a/server/src/com/vaadin/server/LegacyVaadinPortlet.java +++ b/server/src/com/vaadin/server/LegacyVaadinPortlet.java @@ -19,12 +19,12 @@ package com.vaadin.server; import javax.portlet.PortletException; import javax.portlet.PortletRequest; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ServletPortletHelper.ApplicationClassException; public class LegacyVaadinPortlet extends VaadinPortlet { - protected Class getApplicationClass() + protected Class getApplicationClass() throws ClassNotFoundException { try { return ServletPortletHelper @@ -34,10 +34,10 @@ public class LegacyVaadinPortlet extends VaadinPortlet { } } - protected LegacyApplication getNewApplication(PortletRequest request) + protected Application getNewApplication(PortletRequest request) throws PortletException { try { - Class applicationClass = getApplicationClass(); + Class applicationClass = getApplicationClass(); return applicationClass.newInstance(); } catch (Exception e) { throw new PortletException(e); @@ -53,7 +53,7 @@ public class LegacyVaadinPortlet extends VaadinPortlet { // Must set current before running init() VaadinSession.setCurrent(application); - LegacyApplication legacyApplication = getNewApplication(request); + Application legacyApplication = getNewApplication(request); legacyApplication.doInit(); application.addUIProvider(legacyApplication); diff --git a/server/src/com/vaadin/server/LegacyVaadinServlet.java b/server/src/com/vaadin/server/LegacyVaadinServlet.java index d853e55099..93a9410509 100644 --- a/server/src/com/vaadin/server/LegacyVaadinServlet.java +++ b/server/src/com/vaadin/server/LegacyVaadinServlet.java @@ -19,12 +19,12 @@ package com.vaadin.server; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ServletPortletHelper.ApplicationClassException; public class LegacyVaadinServlet extends VaadinServlet { - protected Class getApplicationClass() + protected Class getApplicationClass() throws ClassNotFoundException { try { return ServletPortletHelper @@ -34,10 +34,10 @@ public class LegacyVaadinServlet extends VaadinServlet { } } - protected LegacyApplication getNewApplication(HttpServletRequest request) + protected Application getNewApplication(HttpServletRequest request) throws ServletException { try { - Class applicationClass = getApplicationClass(); + Class applicationClass = getApplicationClass(); return applicationClass.newInstance(); } catch (Exception e) { throw new ServletException(e); @@ -53,7 +53,7 @@ public class LegacyVaadinServlet extends VaadinServlet { // Must set current before running init() VaadinSession.setCurrent(application); - LegacyApplication legacyApplication = getNewApplication(request); + Application legacyApplication = getNewApplication(request); legacyApplication.doInit(); application.addUIProvider(legacyApplication); diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java index 068a9f9192..609168ee96 100644 --- a/server/src/com/vaadin/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/server/ServletPortletHelper.java @@ -3,7 +3,7 @@ package com.vaadin.server; import java.io.Serializable; import java.util.Properties; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ApplicationConstants; import com.vaadin.ui.UI; @@ -41,7 +41,7 @@ class ServletPortletHelper implements Serializable { } } - static Class getLegacyApplicationClass( + static Class getLegacyApplicationClass( DeploymentConfiguration deploymentConfiguration) throws ApplicationClassException { Properties initParameters = deploymentConfiguration @@ -56,7 +56,7 @@ class ServletPortletHelper implements Serializable { try { return classLoader.loadClass(applicationParameter).asSubclass( - LegacyApplication.class); + Application.class); } catch (final ClassNotFoundException e) { throw new ApplicationClassException( "Failed to load application class: " + applicationParameter, diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 0b376f54c1..1c1fcf5492 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -89,7 +89,7 @@ public abstract class UI extends AbstractComponentContainer implements /** * Helper class to emulate the main window from Vaadin 6 using UIs. This * class should be used in the same way as Window used as a browser level - * window in Vaadin 6 with {@link com.vaadin.LegacyApplication} + * window in Vaadin 6 with {@link com.vaadin.Application} */ @Deprecated public static class LegacyWindow extends UI { diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java index 9ee4ffe6e7..2e59f9ee41 100644 --- a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java +++ b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java @@ -6,14 +6,14 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.UI; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; public class AddRemoveSubWindow { - public class TestApp extends LegacyApplication { + public class TestApp extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index 4f37a9b505..1e963a8cc8 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -29,7 +29,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.AbstractUIProvider; import com.vaadin.server.ApplicationConfiguration; import com.vaadin.server.LegacyVaadinServlet; @@ -107,9 +107,9 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } @Override - protected Class getApplicationClass() + protected Class getApplicationClass() throws ClassNotFoundException { - return getClassToRun().asSubclass(LegacyApplication.class); + return getClassToRun().asSubclass(Application.class); } @Override @@ -128,7 +128,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } }); return application; - } else if (LegacyApplication.class.isAssignableFrom(classToRun)) { + } else if (Application.class.isAssignableFrom(classToRun)) { return super.createApplication(request); } else if (UIProvider.class.isAssignableFrom(classToRun)) { VaadinServletSession application = new VaadinServletSession(); diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java index 5d534a4dd8..5d1cb6a5dc 100644 --- a/uitest/src/com/vaadin/tests/Components.java +++ b/uitest/src/com/vaadin/tests/Components.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.DefaultItemSorter; import com.vaadin.data.util.HierarchicalContainer; @@ -30,7 +30,7 @@ import com.vaadin.ui.Tree.ItemStyleGenerator; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Components extends LegacyApplication { +public class Components extends Application { private static final Object CAPTION = "c"; private Map, String> tests = new HashMap, String>(); diff --git a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java index 8f11233f38..af80ac0a88 100644 --- a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -44,7 +44,7 @@ import com.vaadin.ui.Tree; * @since 4.0.0 * */ -public class CustomLayoutDemo extends com.vaadin.LegacyApplication +public class CustomLayoutDemo extends com.vaadin.Application implements Listener { private CustomLayout mainLayout = null; diff --git a/uitest/src/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java index 28cf4a922b..e4d6683e2a 100644 --- a/uitest/src/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/com/vaadin/tests/LayoutDemo.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ClassResource; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; @@ -38,7 +38,7 @@ import com.vaadin.ui.VerticalLayout; * @since 4.0.0 * */ -public class LayoutDemo extends com.vaadin.LegacyApplication { +public class LayoutDemo extends com.vaadin.Application { /** * Initialize Application. Demo components are added to main window. diff --git a/uitest/src/com/vaadin/tests/ListenerOrder.java b/uitest/src/com/vaadin/tests/ListenerOrder.java index c58fa17373..dafa142e1d 100644 --- a/uitest/src/com/vaadin/tests/ListenerOrder.java +++ b/uitest/src/com/vaadin/tests/ListenerOrder.java @@ -3,7 +3,7 @@ package com.vaadin.tests; import java.util.HashMap; import java.util.Iterator; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.Container.PropertySetChangeEvent; @@ -17,7 +17,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; -public class ListenerOrder extends com.vaadin.LegacyApplication +public class ListenerOrder extends com.vaadin.Application implements Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener, ValueChangeListener { diff --git a/uitest/src/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java index 7c9e60c943..04d6c1eb1d 100644 --- a/uitest/src/com/vaadin/tests/ModalWindow.java +++ b/uitest/src/com/vaadin/tests/ModalWindow.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -35,7 +35,7 @@ import com.vaadin.ui.Window; * @see com.vaadin.ui.Window * @see com.vaadin.ui.Label */ -public class ModalWindow extends com.vaadin.LegacyApplication +public class ModalWindow extends com.vaadin.Application implements ClickListener { private Window test; diff --git a/uitest/src/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java index 95b42b7ce5..b364d506ce 100644 --- a/uitest/src/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/com/vaadin/tests/NativeWindowing.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.net.MalformedURLException; import java.net.URL; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; -public class NativeWindowing extends LegacyApplication { +public class NativeWindowing extends Application { LegacyWindow main = new LegacyWindow("Windowing test"); diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java index 01270456c8..206a2e77ab 100644 --- a/uitest/src/com/vaadin/tests/Parameters.java +++ b/uitest/src/com/vaadin/tests/Parameters.java @@ -21,7 +21,7 @@ import java.net.URL; import java.util.Iterator; import java.util.Map; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; @@ -42,7 +42,7 @@ import com.vaadin.ui.VerticalLayout; * * @since 3.1.1 */ -public class Parameters extends com.vaadin.LegacyApplication +public class Parameters extends com.vaadin.Application implements RequestHandler { private final Label context = new Label(); diff --git a/uitest/src/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/com/vaadin/tests/RandomLayoutStress.java index 1bbb35b9e3..60db80eb6a 100644 --- a/uitest/src/com/vaadin/tests/RandomLayoutStress.java +++ b/uitest/src/com/vaadin/tests/RandomLayoutStress.java @@ -18,7 +18,7 @@ package com.vaadin.tests; import java.util.Random; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -44,7 +44,7 @@ import com.vaadin.ui.VerticalLayout; * */ public class RandomLayoutStress extends - com.vaadin.LegacyApplication { + com.vaadin.Application { private final Random seededRandom = new Random(1); diff --git a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java index 831a863d5b..bce62a65b0 100644 --- a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java +++ b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java @@ -1,6 +1,6 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -17,7 +17,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; -public class ScrollbarStressTest extends LegacyApplication { +public class ScrollbarStressTest extends Application { final LegacyWindow main = new LegacyWindow("Scrollbar Stress Test"); diff --git a/uitest/src/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java index 098ce4af29..41d7d207cb 100644 --- a/uitest/src/com/vaadin/tests/TestBench.java +++ b/uitest/src/com/vaadin/tests/TestBench.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.server.ExternalResource; @@ -51,7 +51,7 @@ import com.vaadin.ui.VerticalLayout; * @author Vaadin Ltd. * */ -public class TestBench extends com.vaadin.LegacyApplication +public class TestBench extends com.vaadin.Application implements Property.ValueChangeListener { // Add here packages which are used for finding testable classes @@ -223,7 +223,7 @@ public class TestBench extends com.vaadin.LegacyApplication private Component createTestable(Class c) { try { - final LegacyApplication app = (LegacyApplication) c + final Application app = (Application) c .newInstance(); app.doInit(); Layout lo = (Layout) app.getMainWindow().getContent(); diff --git a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index 99ae361471..e5998592b7 100644 --- a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; @@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends - LegacyApplication { + Application { LegacyWindow main = new LegacyWindow("Windowing test"); diff --git a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java index f7bad7cd19..6f131bdb8e 100644 --- a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.net.MalformedURLException; import java.net.URL; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; -public class TestForNativeWindowing extends LegacyApplication { +public class TestForNativeWindowing extends Application { LegacyWindow main = new LegacyWindow("Windowing test"); diff --git a/uitest/src/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java index 53bb6d37c2..a534f0ec84 100644 --- a/uitest/src/com/vaadin/tests/TestForStyledUpload.java +++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java @@ -26,7 +26,7 @@ import java.io.OutputStream; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.StreamResource; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; @@ -48,7 +48,7 @@ import com.vaadin.ui.Upload.SucceededEvent; import com.vaadin.ui.Upload.SucceededListener; import com.vaadin.ui.VerticalLayout; -public class TestForStyledUpload extends LegacyApplication +public class TestForStyledUpload extends Application implements Upload.FinishedListener, FailedListener, SucceededListener, StartedListener { diff --git a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java index 1edf7b2d88..2e81daa781 100644 --- a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -25,7 +25,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; public class TestSetVisibleAndCaching extends - com.vaadin.LegacyApplication { + com.vaadin.Application { Panel panelA = new Panel("Panel A"); Panel panelB = new Panel("Panel B"); diff --git a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java index b9de56e35c..c376b40e24 100644 --- a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java +++ b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java @@ -21,7 +21,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Iterator; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.IndexedContainer; @@ -41,7 +41,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class TestSizeableIncomponents extends LegacyApplication { +public class TestSizeableIncomponents extends Application { private IndexedContainer cont; private ComboBox select; diff --git a/uitest/src/com/vaadin/tests/TestSplitPanel.java b/uitest/src/com/vaadin/tests/TestSplitPanel.java index 52f2538343..dddef837c7 100644 --- a/uitest/src/com/vaadin/tests/TestSplitPanel.java +++ b/uitest/src/com/vaadin/tests/TestSplitPanel.java @@ -16,12 +16,12 @@ package com.vaadin.tests; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalSplitPanel; -public class TestSplitPanel extends com.vaadin.LegacyApplication { +public class TestSplitPanel extends com.vaadin.Application { VerticalSplitPanel verticalSplit = new VerticalSplitPanel(); diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java index 3d1705381e..5434bbdd82 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java @@ -18,7 +18,7 @@ package com.vaadin.tests; import java.io.File; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.server.VaadinSession; import com.vaadin.shared.ui.label.ContentMode; @@ -38,7 +38,7 @@ import com.vaadin.ui.UI.LegacyWindow; * @since 4.0.0 * */ -public class TreeFilesystem extends com.vaadin.LegacyApplication +public class TreeFilesystem extends com.vaadin.Application implements Tree.ExpandListener { // Filesystem explorer panel and it's components diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java index b61a7a53a5..4390b24d4b 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java @@ -18,7 +18,7 @@ package com.vaadin.tests; import java.io.File; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.FilesystemContainer; import com.vaadin.data.util.FilesystemContainer.FileItem; import com.vaadin.server.VaadinSession; @@ -43,7 +43,7 @@ import com.vaadin.ui.VerticalLayout; * */ public class TreeFilesystemContainer extends - com.vaadin.LegacyApplication implements Listener { + com.vaadin.Application implements Listener { // Filesystem explorer panel and it's components private final Panel explorerPanel = new Panel("Filesystem explorer"); diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java index 1b0fc93a55..04980b7aac 100644 --- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.util.LinkedList; import java.util.Random; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.shared.ui.label.ContentMode; @@ -29,7 +29,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; public class UsingObjectsInSelect extends - com.vaadin.LegacyApplication implements ValueChangeListener { + com.vaadin.Application implements ValueChangeListener { private final Select select = new Select(); private final Label selectedTask = new Label("Selected task", diff --git a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java index 19b872cb2f..c819f4ebea 100644 --- a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java +++ b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.appengine; import com.google.apphosting.api.DeadlineExceededException; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.ClassResource; @@ -15,7 +15,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; import com.vaadin.ui.UI.LegacyWindow; -public class GAESyncTest extends LegacyApplication { +public class GAESyncTest extends Application { /** * @@ -50,10 +50,10 @@ public class GAESyncTest extends LegacyApplication { private static final long serialVersionUID = -6521351715072191625l; TextField tf; Label l; - LegacyApplication app; + Application app; GridLayout gl; - private IntrWindow(LegacyApplication app) { + private IntrWindow(Application app) { this.app = app; tf = new TextField("Echo thingie"); diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java index 356b130433..7556976d00 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.VaadinSession; import com.vaadin.server.WebBrowser; -public abstract class AbstractTestCase extends LegacyApplication { +public abstract class AbstractTestCase extends Application { protected abstract String getDescription(); diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index cba699b701..4482cf3121 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.combobox; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") -public class ComboBoxReapperingOldValue extends LegacyApplication +public class ComboBoxReapperingOldValue extends Application implements ValueChangeListener { ComboBox cbox1 = new ComboBox(); diff --git a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java index 9608db5772..218e3998a6 100644 --- a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java +++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.form; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Form; @@ -10,7 +10,7 @@ import com.vaadin.ui.TextField; @SuppressWarnings("serial") public class UndefinedWideFormWithRelativeWideFooter extends - LegacyApplication { + Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index e469d13e07..6de14e949b 100644 --- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.loginform; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.LoginForm; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") -public class LoginFormWithMultipleWindows extends LegacyApplication { +public class LoginFormWithMultipleWindows extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java index 5d36b8381b..27905b5cf9 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java +++ b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.table; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class TableFirstRowFlicker extends LegacyApplication { +public class TableFirstRowFlicker extends Application { Table t; diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java index 135c00182e..bab39bf656 100644 --- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java +++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.textfield; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Component; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; @@ -8,7 +8,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class TextFieldInLayoutInTable extends LegacyApplication { +public class TextFieldInLayoutInTable extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index 9c2a6f387c..3af415217c 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -2,7 +2,7 @@ package com.vaadin.tests.containers.sqlcontainer; import java.sql.SQLException; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.Item; @@ -15,7 +15,7 @@ import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class CheckboxUpdateProblem extends LegacyApplication +public class CheckboxUpdateProblem extends Application implements Property.ValueChangeListener { private final DatabaseHelper databaseHelper = new DatabaseHelper(); private Table testList; diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java index edaefeb0c3..e33607b4f7 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java @@ -1,6 +1,6 @@ package com.vaadin.tests.containers.sqlcontainer; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractSelect.Filtering; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI; @@ -8,7 +8,7 @@ import com.vaadin.ui.UI; /** * See http://dev.vaadin.com/ticket/9155 . */ -public class ComboBoxUpdateProblem extends LegacyApplication { +public class ComboBoxUpdateProblem extends Application { private final DatabaseHelper databaseHelper = new DatabaseHelper(); @Override diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index 3a07a89302..1546f51a33 100644 --- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -2,7 +2,7 @@ package com.vaadin.tests.containers.sqlcontainer; import java.sql.SQLException; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.sqlcontainer.SQLContainer; import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; @@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout; // +-------------+-------------+------+-----+---------+----------------+ @SuppressWarnings("serial") -public class MassInsertMemoryLeakTestApp extends LegacyApplication { +public class MassInsertMemoryLeakTestApp extends Application { ProgressIndicator proggress = new ProgressIndicator(); Button process = new Button("Mass insert"); diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java index 03af8bbd52..d3c85cbde5 100644 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -1,6 +1,6 @@ package com.vaadin.tests.integration; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.UI.LegacyWindow; -public class IntegrationTestApplication extends LegacyApplication { +public class IntegrationTestApplication extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java index f3c7f009c8..db8307b635 100644 --- a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -18,7 +18,7 @@ import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; import javax.portlet.WindowState; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.annotations.StyleSheet; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinPortletSession; @@ -37,7 +37,7 @@ import com.vaadin.ui.Upload.Receiver; /** * Adapted from old PortletDemo to support integration testing. */ -public class JSR286PortletApplication extends LegacyApplication { +public class JSR286PortletApplication extends Application { @StyleSheet("PortletConnectorResource.css") public final class LegacyWindowWithStylesheet extends LegacyWindow { diff --git a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java index d4b9d3e4af..82761afa68 100644 --- a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.Iterator; import java.util.Locale; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.event.Action; @@ -57,7 +57,7 @@ import com.vaadin.ui.Window; import com.vaadin.ui.themes.LiferayTheme; @SuppressWarnings("serial") -public class LiferayThemeDemo extends LegacyApplication { +public class LiferayThemeDemo extends Application { @SuppressWarnings("deprecation") private static final Date DATE = new Date(2009 - 1900, 6 - 1, 2); diff --git a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java index 897649fcc2..abbc819705 100644 --- a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java +++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java @@ -1,6 +1,6 @@ package com.vaadin.tests.integration; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; @@ -12,7 +12,7 @@ import com.vaadin.ui.VerticalLayout; * See ticket #5521. */ public class PortletSizeInLiferayFreeformLayoutApplication extends - LegacyApplication { + Application { @Override public void init() { LegacyWindow mainWindow = new LegacyWindow("Portlet5521 Application"); diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java index df34dc2f66..66248d7a5b 100644 --- a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java +++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java @@ -1,12 +1,12 @@ package com.vaadin.tests.layouts; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.UI.LegacyWindow; -public class GridLayoutInsidePanel2 extends LegacyApplication { +public class GridLayoutInsidePanel2 extends Application { private Layout layout; diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index ddf79989f1..8da94feb7f 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -2,7 +2,7 @@ package com.vaadin.tests.layouts.layouttester; import java.util.Date; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.Resource; import com.vaadin.server.SystemError; import com.vaadin.server.ThemeResource; @@ -32,7 +32,7 @@ public class GridLayoutTests extends AbstractLayoutTests { private AbstractComponent rc1, col1, col2, col3, row1, row2, row3, x3, x22; - public GridLayoutTests(LegacyApplication application) { + public GridLayoutTests(Application application) { super(); } diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index 2525a5e620..0042f0ba11 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -1,6 +1,6 @@ package com.vaadin.tests.layouts.layouttester; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.Resource; import com.vaadin.server.SystemError; import com.vaadin.server.ThemeResource; @@ -26,7 +26,7 @@ import com.vaadin.ui.themes.Reindeer; public class HorizontalLayoutTests extends AbstractLayoutTests { - public HorizontalLayoutTests(LegacyApplication application) { + public HorizontalLayoutTests(Application application) { super(); } diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 0322178ac8..3e668289fe 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -1,6 +1,6 @@ package com.vaadin.tests.layouts.layouttester; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.Resource; import com.vaadin.server.SystemError; import com.vaadin.server.ThemeResource; @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; public class VerticalLayoutTests extends AbstractLayoutTests { - public VerticalLayoutTests(LegacyApplication application) { + public VerticalLayoutTests(Application application) { super(); } diff --git a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java index 551f9d8fbf..411dbed340 100644 --- a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java +++ b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java @@ -1,6 +1,6 @@ package com.vaadin.tests.themes; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.server.ThemeResource; @@ -15,7 +15,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") -public class ButtonsTest extends com.vaadin.LegacyApplication { +public class ButtonsTest extends com.vaadin.Application { final UI.LegacyWindow main = new LegacyWindow("Button states & themes"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java index 8f0edb3116..5ea26c882e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Alignment; @@ -16,7 +16,7 @@ import com.vaadin.ui.VerticalSplitPanel; * properly. Scrollbars will disappear if "shaking" content a bit, like * selecting tests in area. */ -public class Ticket1225 extends LegacyApplication { +public class Ticket1225 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java index 860f0ec8c4..69a1e7d20d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; -public class Ticket1230 extends LegacyApplication { +public class Ticket1230 extends Application { private static final Object PROPERTY_ID = new Object(); private static final Object NULL_ITEM_ID = new Object(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java index b63f453ada..6fc67af975 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket124 extends LegacyApplication { +public class Ticket124 extends Application { private TextField tf; private GridLayout gl; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java index bf7be0f291..0c72d8ecaa 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.ui.AbstractSelect; @@ -12,7 +12,7 @@ import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; -public class Ticket1245 extends com.vaadin.LegacyApplication { +public class Ticket1245 extends com.vaadin.Application { TextField f = new TextField(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java index 1306e95af9..80b29fff17 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; @@ -8,7 +8,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1365 extends com.vaadin.LegacyApplication +public class Ticket1365 extends com.vaadin.Application implements Handler { TextField f = new TextField(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java index 2ac04ebcaf..27410af474 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI.LegacyWindow; @@ -8,7 +8,7 @@ import com.vaadin.ui.Table; /** */ -public class Ticket1368 extends LegacyApplication { +public class Ticket1368 extends Application { private Table t; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java index 8c5b9ffcf4..7cbe2cfd3b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.Date; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.Button; import com.vaadin.ui.Component; @@ -14,7 +14,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -public class Ticket1397 extends LegacyApplication { +public class Ticket1397 extends Application { LegacyWindow main; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java index a31b421bf2..fa6a4d42f7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -16,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket1435 extends LegacyApplication { +public class Ticket1435 extends Application { private static final boolean useWorkaround = true; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java index 70fc394f62..256b519371 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1444 extends LegacyApplication { +public class Ticket1444 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index e57eb0962a..c13b6968ed 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -8,7 +8,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; -public class Ticket1465ModalNotification extends LegacyApplication { +public class Ticket1465ModalNotification extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java index fea7725e66..cd3bc86677 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; -public class Ticket1519 extends LegacyApplication { +public class Ticket1519 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java index 44ef87f428..adeb4c7a87 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1572 extends com.vaadin.LegacyApplication { +public class Ticket1572 extends com.vaadin.Application { private Label state; private GridLayout gl; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java index 0ee53004e8..8766e1135a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.Date; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1581 extends com.vaadin.LegacyApplication { +public class Ticket1581 extends com.vaadin.Application { private Label time; private ProgressIndicator poller; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java index 4e90ae0e9e..82cfa2b3ec 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java @@ -10,7 +10,7 @@ import java.util.Date; import javax.imageio.ImageIO; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.DownloadStream; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; @@ -20,7 +20,7 @@ import com.vaadin.server.WrappedResponse; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1589 extends LegacyApplication { +public class Ticket1589 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java index cbb1f88043..e1f04cbf8e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java @@ -3,14 +3,14 @@ package com.vaadin.tests.tickets; import java.util.ArrayList; import java.util.List; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ThemeResource; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1598 extends LegacyApplication { +public class Ticket1598 extends Application { LegacyWindow main = new LegacyWindow("MenuBar test"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java index 6a6f95a9b5..94eba29551 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket161.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; @@ -10,7 +10,7 @@ import com.vaadin.ui.Table; /** */ -public class Ticket161 extends LegacyApplication { +public class Ticket161 extends Application { private Table t; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java index 9ecdff39d5..ff50380c42 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -9,7 +9,7 @@ import com.vaadin.ui.Table; /** */ -public class Ticket1632 extends LegacyApplication { +public class Ticket1632 extends Application { private Table t; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java index a587aa5a94..cd96ac56c7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1659 extends LegacyApplication { +public class Ticket1659 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java index 9a08dc8502..7a5c1163b5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.SystemError; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1663 extends com.vaadin.LegacyApplication { +public class Ticket1663 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java index 663d955e77..c2b7b38435 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.CustomizedSystemMessages; import com.vaadin.server.SystemMessages; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1673 extends com.vaadin.LegacyApplication { +public class Ticket1673 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java index b4258dff61..641bd43f70 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.MethodProperty; @@ -29,7 +29,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket1710 extends com.vaadin.LegacyApplication { +public class Ticket1710 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java index 4384215943..8bb244545a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ClassResource; import com.vaadin.server.DownloadStream; import com.vaadin.server.Resource; @@ -10,7 +10,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1737 extends LegacyApplication { +public class Ticket1737 extends Application { Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") { @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java index f2e2dd32b8..42706a1428 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1767 extends com.vaadin.LegacyApplication { +public class Ticket1767 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java index 648fa4e598..a2ddbebad8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1772 extends com.vaadin.LegacyApplication { +public class Ticket1772 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java index 3d9165e491..80a19720bb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1775 extends com.vaadin.LegacyApplication { +public class Ticket1775 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java index 196a4863db..d7c9a45992 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; import com.vaadin.server.SystemError; @@ -16,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; -public class Ticket1804 extends com.vaadin.LegacyApplication { +public class Ticket1804 extends com.vaadin.Application { LinkedList(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java index 329bfeaa38..376173ebf2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.Alignment; @@ -11,7 +11,7 @@ import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1805 extends com.vaadin.LegacyApplication { +public class Ticket1805 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java index 333350f94e..31746b455d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1806 extends com.vaadin.LegacyApplication { +public class Ticket1806 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java index 066587e349..d68fc8be3d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Validator; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.shared.ui.label.ContentMode; @@ -14,7 +14,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -public class Ticket1811 extends com.vaadin.LegacyApplication { +public class Ticket1811 extends com.vaadin.Application { LinkedList listOfAllFields = new LinkedList(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java index 1ff918b676..162bfbad2d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; @@ -13,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.Window; -public class Ticket1819 extends com.vaadin.LegacyApplication { +public class Ticket1819 extends com.vaadin.Application { LinkedList(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 614d3aff62..a929b3a60b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -10,7 +10,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; public class Ticket1834PanelScrolling extends - com.vaadin.LegacyApplication { + com.vaadin.Application { private static final int ROWS = 50; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java index dd304a14aa..1b74d3c142 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.event.Action; @@ -11,7 +11,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1857 extends LegacyApplication implements +public class Ticket1857 extends Application implements Handler { @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java index ff8c512339..b301eb1ea9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1868 extends com.vaadin.LegacyApplication { +public class Ticket1868 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java index cd1be102ec..f704235178 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -8,7 +8,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1869 extends com.vaadin.LegacyApplication { +public class Ticket1869 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java index 5d8074d553..3b53023084 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.Iterator; import java.util.Random; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.BeanItem; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.server.Resource; @@ -27,7 +27,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket1878 extends LegacyApplication { +public class Ticket1878 extends Application { private Layout orderedLayout; private Layout gridLayout; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java index 573634d61b..d1bd127500 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1900 extends LegacyApplication { +public class Ticket1900 extends Application { TextField f[] = new TextField[5]; LegacyWindow main = new LegacyWindow("#1900 test"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java index ee6a9fe638..5891831038 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -8,7 +8,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1904 extends LegacyApplication { +public class Ticket1904 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java index 03efef3b2c..422b6e57d0 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket1916 extends LegacyApplication { +public class Ticket1916 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java index 6c0fa581ac..ae7f44dc19 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1919 extends com.vaadin.LegacyApplication { +public class Ticket1919 extends com.vaadin.Application { private GridLayout lo; private boolean on = true; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java index 6f525a1bfc..33be859fec 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.io.IOException; import java.util.Map; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; import com.vaadin.server.WrappedRequest; @@ -14,7 +14,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1921 extends LegacyApplication implements +public class Ticket1921 extends Application implements RequestHandler { int state = -1; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java index fde8fa0638..32c4adeff9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1923 extends com.vaadin.LegacyApplication { +public class Ticket1923 extends com.vaadin.Application { private static final int ROWS = 50; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java index ccf21c7206..8e0b65bb6e 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java @@ -1,9 +1,9 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1925 extends LegacyApplication { +public class Ticket1925 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java index 6abfc730b6..ee349c79e1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket1939 extends LegacyApplication { +public class Ticket1939 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java index 11f4cfe40d..5d5b9c4918 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket1940 extends LegacyApplication { +public class Ticket1940 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java index 3824f1f662..8fd62b8a2b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1953 extends LegacyApplication { +public class Ticket1953 extends Application { public static final String cellStyle = "test-cell"; public static final String colHeadStyle = "test-col-head"; public static final String headingStyle = "test-heading"; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java index 461923da9c..ebd04a8857 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -12,7 +12,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1966 extends LegacyApplication { +public class Ticket1966 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java index 8a5641d05c..12b17a4601 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -12,7 +12,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket1966_2 extends LegacyApplication { +public class Ticket1966_2 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java index c27e81f0c7..577ca463bc 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; @@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket1966_3 extends LegacyApplication { +public class Ticket1966_3 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java index df1e40e1eb..04cd11ce72 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.UserError; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; @@ -11,7 +11,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket1969 extends com.vaadin.LegacyApplication { +public class Ticket1969 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java index 135d21ca36..839e9e683c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java @@ -2,14 +2,14 @@ package com.vaadin.tests.tickets; import java.util.Iterator; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1970 extends LegacyApplication { +public class Ticket1970 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java index 2d73edf487..0de827bfd2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1972 extends LegacyApplication { +public class Ticket1972 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java index 2e77e0e594..b91d8dfee3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; @@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket1973 extends com.vaadin.LegacyApplication { +public class Ticket1973 extends com.vaadin.Application { LegacyWindow main = new LegacyWindow(); Table table = new Table(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java index eca5e69a69..9ea740b546 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; @@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket1973_2 extends LegacyApplication { +public class Ticket1973_2 extends Application { LegacyWindow main = new LegacyWindow(); Table table = new Table(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java index 117f99883c..93ecf4b6eb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java @@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -14,7 +14,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.util.CurrentInstance; -public class Ticket1975 extends LegacyApplication { +public class Ticket1975 extends Application { private CustomLayout cl1; private CustomLayout cl2; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java index 55e95f0eb3..433dce1bfb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.ArrayList; import java.util.List; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -12,7 +12,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket1982 extends LegacyApplication { +public class Ticket1982 extends Application { private List components = new ArrayList(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java index 7f728b2ab5..2e38c7c1b1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; @@ -16,7 +16,7 @@ import com.vaadin.ui.VerticalLayout; /** * Test class for ticket 1983 */ -public class Ticket1983 extends LegacyApplication { +public class Ticket1983 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java index df1c640795..dc452e1664 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; @@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.TwinColSelect; -public class Ticket1986 extends LegacyApplication { +public class Ticket1986 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java index 1dad9e0b55..ef3b4c73e8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.CheckBox; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket1991 extends com.vaadin.LegacyApplication { +public class Ticket1991 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java index 21ccc28d55..cf628ad806 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Container.Filterable; import com.vaadin.data.Item; @@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket1995 extends LegacyApplication { +public class Ticket1995 extends Application { private static final Object PROPERTY_1 = "Test"; private Table table; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java index cb391395b1..e8ea84c96d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket20.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.CompositeValidator; @@ -11,7 +11,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket20 extends LegacyApplication { +public class Ticket20 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java index f8e9154c42..447d0e671c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; @@ -8,7 +8,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2001 extends LegacyApplication { +public class Ticket2001 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java index 4be6577aaa..148d7e67ef 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2002 extends LegacyApplication { +public class Ticket2002 extends Application { private Long long1 = new Long(1L); private Long long2 = new Long(2L); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java index d97444d5c7..4b64cc33d2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2007 extends LegacyApplication { +public class Ticket2007 extends Application { int childs = 0; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java index 1e79eaab39..a3517fdf76 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.event.ItemClickEvent; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; @@ -16,7 +16,7 @@ import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class Ticket2009 extends com.vaadin.LegacyApplication { +public class Ticket2009 extends com.vaadin.Application { TextField f = new TextField(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java index 708b5758ad..65634de549 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; -public class Ticket2011 extends LegacyApplication { +public class Ticket2011 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java index 1398feca2b..bf05b8bb14 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.UUID; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2014 extends LegacyApplication { +public class Ticket2014 extends Application { private HorizontalLayout innerLayout1; private Button b1; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java index 7bbdc1637c..8ebf41bbe4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; @@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; -public class Ticket2021 extends LegacyApplication { +public class Ticket2021 extends Application { private TextArea tf1, tf2, tf3; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java index a5737a0fbf..523e1b7f7d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2022 extends LegacyApplication { +public class Ticket2022 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java index 0e52b932b7..a336f18428 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2023 extends com.vaadin.LegacyApplication +public class Ticket2023 extends com.vaadin.Application implements Button.ClickListener { AbstractComponent c = new Button(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java index e7201aaf89..4ef8c2fa89 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2024 extends LegacyApplication { +public class Ticket2024 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java index c96404bf53..9528f2c56b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2026 extends LegacyApplication { +public class Ticket2026 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java index 7859ccc642..bf11aa312a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.Random; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.server.UserError; @@ -16,7 +16,7 @@ import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2029 extends LegacyApplication { +public class Ticket2029 extends Application { int COMPONENTS; int DIM1, DIM2; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java index a02432202e..f39e6a2845 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -8,7 +8,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2037 extends com.vaadin.LegacyApplication { +public class Ticket2037 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java index 03e7861a90..db01fae34f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.CheckBox; @@ -8,7 +8,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2038 extends LegacyApplication { +public class Ticket2038 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java index be3e7b0c39..2c30f666dc 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Accordion; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; @@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -public class Ticket2040 extends com.vaadin.LegacyApplication { +public class Ticket2040 extends com.vaadin.Application { TextField f = new TextField(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java index c96dd52183..2cb9e103d6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2042 extends LegacyApplication { +public class Ticket2042 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java index d3d984c8be..84e7167164 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2043 extends LegacyApplication { +public class Ticket2043 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java index 05ca9c4526..4d9454341a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ThemeResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -13,7 +13,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2048 extends LegacyApplication { +public class Ticket2048 extends Application { private Embedded embedded; private Panel p; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java index d536db0e14..b1c2666808 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; import com.vaadin.ui.Component; @@ -11,7 +11,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -public class Ticket2051 extends LegacyApplication { +public class Ticket2051 extends Application { private static final Object P1 = new Object(); private static final Object P2 = new Object(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java index ae0ba0c315..33c1313e20 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.ExternalResource; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2053 extends LegacyApplication { +public class Ticket2053 extends Application { int childs = 0; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java index a461264237..de5f44d0e8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2060 extends LegacyApplication { +public class Ticket2060 extends Application { private Button button1; private Button button2; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java index a2f599f139..54f1d22a45 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -13,7 +13,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket2061 extends LegacyApplication { +public class Ticket2061 extends Application { private LegacyWindow mainWindow; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java index 0b76d2e83a..402b1c195c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -21,7 +21,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class Ticket2061b extends LegacyApplication implements +public class Ticket2061b extends Application implements SelectedTabChangeListener { private LegacyWindow mainWindow; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java index 2af686ced0..14f1a3b6ea 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -17,7 +17,7 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket2061c extends LegacyApplication implements +public class Ticket2061c extends Application implements SelectedTabChangeListener { private LegacyWindow mainWindow; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java index 12149e6eda..24122b7dee 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -public class Ticket2062 extends LegacyApplication { +public class Ticket2062 extends Application { private static final Object P1 = new Object(); @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java index 061fb47f76..69583ce367 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2083 extends LegacyApplication { +public class Ticket2083 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java index 50deab7a8a..786d922973 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.UserError; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2090 extends LegacyApplication { +public class Ticket2090 extends Application { Label label = new Label(); Button target = new Button(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java index 701c306c19..c0152a1fc9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Embedded; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2095 extends LegacyApplication { +public class Ticket2095 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java index 6db08f5063..a4ba5b0595 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; -public class Ticket2098 extends LegacyApplication { +public class Ticket2098 extends Application { private static final String info = "First tab hidden, second should initially be selected"; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java index 08acda39f2..f5e36a1650 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class Ticket2099 extends LegacyApplication { +public class Ticket2099 extends Application { private Label l1, l2, l3; private VerticalLayout ol1, ol2, ol3; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java index c4c6b7320d..c38e4b6ed2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2101 extends LegacyApplication { +public class Ticket2101 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java index 43c86efd9d..7dc7d7bf95 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.ui.Accordion; @@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket2103 extends LegacyApplication { +public class Ticket2103 extends Application { private LegacyWindow mainWindow; @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java index cb1173d6e9..f3fb936c9a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.MethodProperty; @@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; -public class Ticket2104 extends LegacyApplication { +public class Ticket2104 extends Application { private static final Label info = new Label( "Click event should _always_ come trough. Switching features on/off should immediatly affect the tree (verify w/ debug window)", diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java index 569d4fe30f..f509a082e1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.util.Date; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.CustomizedSystemMessages; import com.vaadin.server.SystemMessages; import com.vaadin.ui.Button; @@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2106 extends LegacyApplication { +public class Ticket2106 extends Application { private static CustomizedSystemMessages msgs = new CustomizedSystemMessages(); static { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java index 553221a874..c6dd33fdd9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; @@ -9,7 +9,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2107 extends LegacyApplication { +public class Ticket2107 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java index 24aec36422..e4365c3edb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; @@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2117 extends LegacyApplication { +public class Ticket2117 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java index 81bba1d6c8..9c02eef318 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; import com.vaadin.server.ExternalResource; @@ -15,7 +15,7 @@ import com.vaadin.ui.VerticalLayout; /** * Test case for Ticket 2119. */ -public class Ticket2119 extends LegacyApplication { +public class Ticket2119 extends Application { private ObjectProperty globalValue; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java index 5101b6d46b..8b65bc6b0d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.MethodProperty; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; @@ -10,7 +10,7 @@ import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2125 extends LegacyApplication { +public class Ticket2125 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java index 6121832da6..02644d8a67 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Button; @@ -15,7 +15,7 @@ import com.vaadin.ui.Table; * client. * */ -public class Ticket2126 extends com.vaadin.LegacyApplication { +public class Ticket2126 extends com.vaadin.Application { LegacyWindow main = new LegacyWindow(); Table table = new Table(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java index 1606218b88..13611bf16c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; @@ -10,7 +10,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2151 extends LegacyApplication { +public class Ticket2151 extends Application { private Label status; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java index bbd4dcf192..423183bddf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2157 extends LegacyApplication { +public class Ticket2157 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java index 897ffaaf1b..33b5177935 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2178 extends LegacyApplication { +public class Ticket2178 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java index 1bfa5c2beb..9894baa00b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Validator; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2179 extends LegacyApplication { +public class Ticket2179 extends Application { TextField f = new TextField("Test fiel ( must contain 1 & 2 )"); LegacyWindow main = new LegacyWindow("Dual validator test"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java index 1629db4737..4de46eff3a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; -public class Ticket2180 extends LegacyApplication { +public class Ticket2180 extends Application { private LegacyWindow mainWindow; private TabSheet tabSheet; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java index 892505306a..cc9fa442c9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.Random; import java.util.Set; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.ui.Button; @@ -16,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2181 extends LegacyApplication implements +public class Ticket2181 extends Application implements Button.ClickListener { // private static final Object PROPERTY_VALUE = new Object(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java index 27bec589d0..ed1873b9f8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket2186 extends LegacyApplication { +public class Ticket2186 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java index f9591d19fa..f7116348fd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; import com.vaadin.ui.AbstractOrderedLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class Ticket2204 extends LegacyApplication { +public class Ticket2204 extends Application { private final List textAreas = new ArrayList(); private TabSheet ts; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java index c517e50070..c8c1eba9d7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2208 extends LegacyApplication { +public class Ticket2208 extends Application { private Table t; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java index 6dc1e7bd71..9e84b82a0f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2209 extends LegacyApplication { +public class Ticket2209 extends Application { private GridLayout gl; private ComboBox combo; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java index 55b7a17c89..76ce659370 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2209OL extends LegacyApplication { +public class Ticket2209OL extends Application { private VerticalLayout gl; private ComboBox combo; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java index 9615b6f249..63947d91fb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2209OL2 extends LegacyApplication { +public class Ticket2209OL2 extends Application { private VerticalLayout gl; private ComboBox combo; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java index 6dfcf9d344..1a9e4382d7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; -public class Ticket2215 extends LegacyApplication { +public class Ticket2215 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java index 8fc62800e0..4677995119 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -13,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2221 extends LegacyApplication { +public class Ticket2221 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java index e46477e4de..c0b56f14c2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -8,7 +8,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2222 extends LegacyApplication { +public class Ticket2222 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java index 5ef06379e0..56bdc7782d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Component; import com.vaadin.ui.Label; @@ -10,7 +10,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; public class Ticket2227OrderedlayoutInTable extends - LegacyApplication { + Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java index 935c34fec2..c26c08c0bd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2231 extends LegacyApplication { +public class Ticket2231 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java index 4aa1b948a5..48b4765c0a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.Layout.SpacingHandler; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2232 extends LegacyApplication { +public class Ticket2232 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java index dcc3f90696..a66164043a 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2234 extends LegacyApplication { +public class Ticket2234 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java index 2587937cbc..9126b9916b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; -public class Ticket2235 extends LegacyApplication { +public class Ticket2235 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java index 27235c1afb..5f9a005af0 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2240 extends LegacyApplication { +public class Ticket2240 extends Application { public static final String txt = "

There are two main types of windows: application-level windows, and " + "\"sub windows\".

A sub window is rendered as a \"inline\" popup window" diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java index d0191d3d13..e49920a4d1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -13,7 +13,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket2242 extends LegacyApplication implements +public class Ticket2242 extends Application implements ValueChangeListener { private Object tableValue = null; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java index 5b46e0332d..e65e826a53 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.BeanItem; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -10,7 +10,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2244 extends LegacyApplication { +public class Ticket2244 extends Application { Form form; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java index 09d2e7a678..c62ccd0395 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2245 extends LegacyApplication { +public class Ticket2245 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java index 1a8e743f42..0cedac4490 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2267 extends LegacyApplication { +public class Ticket2267 extends Application { Label l = new Label("0"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java index 71f47be1b3..c784385e93 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2271 extends LegacyApplication { +public class Ticket2271 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java index 8f6da9ffc5..b805f2403c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2282 extends LegacyApplication { +public class Ticket2282 extends Application { private FormLayout layout1; private FormLayout layout2; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java index daac9ae704..3a174bf9cf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2283 extends LegacyApplication { +public class Ticket2283 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java index 9d7bc32d2b..fc7e5feadf 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -11,7 +11,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -public class Ticket2289 extends LegacyApplication { +public class Ticket2289 extends Application { TabSheet ts = null; Accordion acc = null; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java index 0f663d78f5..adafa93a75 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.imageio.ImageIO; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.DownloadStream; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; @@ -22,7 +22,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2292 extends com.vaadin.LegacyApplication +public class Ticket2292 extends com.vaadin.Application implements RequestHandler { @Override diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java index cfa5ecdd61..e8b36596fc 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2294 extends LegacyApplication { +public class Ticket2294 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java index 2a19899425..d274151b63 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2296 extends LegacyApplication { +public class Ticket2296 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java index dd6a3886ac..b32828abfb 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java @@ -3,13 +3,13 @@ package com.vaadin.tests.tickets; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2303 extends LegacyApplication { +public class Ticket2303 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java index 84321b88f3..6d404643aa 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; -public class Ticket2304 extends LegacyApplication { +public class Ticket2304 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java index 99d10ff36d..f66b5dcc18 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -8,7 +8,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.themes.Reindeer; -public class Ticket2310 extends LegacyApplication { +public class Ticket2310 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java index dd0a54dc63..bb0ceb5629 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; @@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class Ticket2319 extends LegacyApplication { +public class Ticket2319 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java index eba7f2b06d..db33c6f6a6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; -public class Ticket2323 extends LegacyApplication { +public class Ticket2323 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java index f63226d465..cd8239d542 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class Ticket2325 extends LegacyApplication { +public class Ticket2325 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java index c3daa680aa..c575aebb32 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.UI.LegacyWindow; @@ -8,7 +8,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; import com.vaadin.ui.VerticalLayout; -public class Ticket2329 extends LegacyApplication { +public class Ticket2329 extends Application { private Table table; private VerticalLayout mainLo; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java index b2ad360bf8..cc99796588 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2337 extends LegacyApplication { +public class Ticket2337 extends Application { GridLayout gl = new GridLayout(3, 1); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java index e1eb9ed5c4..fb535cbce7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java @@ -3,12 +3,12 @@ package com.vaadin.tests.tickets; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2339 extends LegacyApplication { +public class Ticket2339 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java index 560b945479..3e4d739413 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket2341 extends com.vaadin.LegacyApplication { +public class Ticket2341 extends com.vaadin.Application { @Override public void init() { LegacyWindow main = new LegacyWindow(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java index bf1296ec73..ffc91c60d7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java @@ -2,14 +2,14 @@ package com.vaadin.tests.tickets; import java.util.Random; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; -public class Ticket2344 extends LegacyApplication { +public class Ticket2344 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java index 393aebf2ad..2aa3eccc32 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -8,7 +8,7 @@ import com.vaadin.ui.CustomLayout; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2347 extends LegacyApplication { +public class Ticket2347 extends Application { private Button b1; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java index e7d9e19ab4..e37ed6e782 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Form; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Select; import com.vaadin.ui.VerticalLayout; -public class Ticket2364 extends LegacyApplication { +public class Ticket2364 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java index 8361b0b308..b2737ed3aa 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class Ticket2365 extends LegacyApplication { +public class Ticket2365 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java index 66fbcd0c96..276006ef5b 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket2398 extends LegacyApplication { +public class Ticket2398 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java index b26cfc027a..8b86c6b0b5 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2404 extends LegacyApplication { +public class Ticket2404 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java index 57ed8e86fe..e36d3e24a4 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -13,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2405 extends LegacyApplication { +public class Ticket2405 extends Application { private Label label; private HorizontalSplitPanel split; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java index a6ef9be77a..c14c655cd1 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class Ticket2406 extends LegacyApplication { +public class Ticket2406 extends Application { private Window w; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java index 91c92ac07a..6f9c3c9ac8 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Form; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket2407 extends com.vaadin.LegacyApplication { +public class Ticket2407 extends com.vaadin.Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java index b9784d6941..a73b7fab95 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2411 extends LegacyApplication { +public class Ticket2411 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java index c5d1500876..f58fa51b6d 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket2415 extends LegacyApplication { +public class Ticket2415 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java index d1ecfab9be..bc14a7291f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2420 extends LegacyApplication { +public class Ticket2420 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java index ba4c0b508b..47127c4b55 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TabSheet; -public class Ticket2425 extends LegacyApplication { +public class Ticket2425 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java index a8f2cf9e02..b48d8164c9 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2426 extends LegacyApplication { +public class Ticket2426 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java index 5db59ab45c..4bf17c9668 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; @@ -9,7 +9,7 @@ import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2431 extends LegacyApplication { +public class Ticket2431 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java index 4a1dfb33bb..d741902619 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -10,7 +10,7 @@ import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Layout.SpacingHandler; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2432 extends LegacyApplication { +public class Ticket2432 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java index 7d8ba3ae47..2c7a26f44f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket2434 extends LegacyApplication { +public class Ticket2434 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java index 1445095b1e..bbda394f65 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.PopupView; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket2436 extends LegacyApplication { +public class Ticket2436 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java index f340dd7e80..a61d012f43 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Window; -public class Ticket2526 extends LegacyApplication { +public class Ticket2526 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java index 6e9dea0363..0947d68c9c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java @@ -3,7 +3,7 @@ */ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.UI.LegacyWindow; @@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow; * @author Risto Yrjänä / Vaadin Ltd. * */ -public class Ticket2742 extends LegacyApplication { +public class Ticket2742 extends Application { /* * (non-Javadoc) diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java index 23f875a747..63464617da 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.VerticalLayout; @@ -11,7 +11,7 @@ import com.vaadin.ui.VerticalSplitPanel; * properly. Scrollbars will disappear if "shaking" content a bit, like * selecting tests in area. */ -public class Ticket2901 extends LegacyApplication { +public class Ticket2901 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java index e089c25349..0646d1bed3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Validator; import com.vaadin.data.util.BeanItemContainer; @@ -38,7 +38,7 @@ import com.vaadin.ui.themes.Reindeer; * * Other browsers are much faster. */ -public class Ticket2998 extends LegacyApplication { +public class Ticket2998 extends Application { private Table table; private VerticalLayout mainLayout; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java index fe91040f2f..f82400a3b7 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java @@ -3,14 +3,14 @@ package com.vaadin.tests.tickets; import java.util.Collection; import java.util.HashSet; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -public class Ticket3146 extends LegacyApplication { +public class Ticket3146 extends Application { Table table; TextField result; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java index 394ff0613e..da4cf3ce5c 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket34.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.HashMap; import java.util.Map; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.Page; import com.vaadin.server.Page.FragmentChangedEvent; import com.vaadin.ui.Button; @@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -public class Ticket34 extends LegacyApplication { +public class Ticket34 extends Application { private Map views = new HashMap(); private VerticalLayout mainLayout; diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java index b055e63789..e263bf66fd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java @@ -1,13 +1,13 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.ComboBox; import com.vaadin.ui.UI.LegacyWindow; /** * #5053: Last ComboBox item may not be shown if null selection enabled */ -public class Ticket5053 extends LegacyApplication { +public class Ticket5053 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java index 0bcd4e60bd..f169431341 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.ui.Label; @@ -14,7 +14,7 @@ import com.vaadin.ui.TextField; * Therefore, registering e.g. F8 as a key code resulted in "w" being used as * the trigger and F8 being ignored. */ -public class Ticket5157 extends LegacyApplication { +public class Ticket5157 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java index c240d94f0c..7af3da6990 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket5952 extends LegacyApplication { +public class Ticket5952 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java index 6b0ffc02ed..1d95f3945f 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket677.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; @@ -21,7 +21,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -public class Ticket677 extends LegacyApplication { +public class Ticket677 extends Application { private static final Label info = new Label( "

  • keep debug window open to see variable changes" diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java index d5f3d74ef0..68031b1fbd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket695.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java @@ -4,13 +4,13 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; @SuppressWarnings("serial") -public class Ticket695 extends LegacyApplication { +public class Ticket695 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java index 865c5483dc..72137500dd 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket736.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.Validator; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.MethodProperty; @@ -17,7 +17,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.UI.LegacyWindow; -public class Ticket736 extends LegacyApplication { +public class Ticket736 extends Application { Address address = new Address(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java index d498797ef1..a8170148a2 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket846.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.ui.Button; @@ -8,7 +8,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; -public class Ticket846 extends LegacyApplication { +public class Ticket846 extends Application { @Override public void init() { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java index d6d6304053..3c5332ff01 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket932.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.LegacyApplication; +import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; -public class Ticket932 extends LegacyApplication { +public class Ticket932 extends Application { @Override public void init() {