Rename Application back to LegacyApplication (#9402)

server/src/com/vaadin/Application.java → server/src/com/vaadin/LegacyApplication.java

@@ -44,7 +44,7 @@ import com.vaadin.ui.UI;
  * @since 7.0
  */
 @Deprecated
-public abstract class Application extends AbstractUIProvider implements
+public abstract class LegacyApplication extends AbstractUIProvider implements
         ErrorListener {
     /**
      * Ignore initial / and then get everything up to the next /

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.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 public class LegacyVaadinPortlet extends VaadinPortlet {
 
-    protected Class<? extends Application> getApplicationClass()
+    protected Class<? extends LegacyApplication> getApplicationClass()
             throws ClassNotFoundException {
         try {
             return ServletPortletHelper
@@ -34,10 +34,10 @@ public class LegacyVaadinPortlet extends VaadinPortlet {
         }
     }
 
-    protected Application getNewApplication(PortletRequest request)
+    protected LegacyApplication getNewApplication(PortletRequest request)
             throws PortletException {
         try {
-            Class<? extends Application> applicationClass = getApplicationClass();
+            Class<? extends LegacyApplication> applicationClass = getApplicationClass();
             return applicationClass.newInstance();
         } catch (Exception e) {
             throw new PortletException(e);
@@ -54,7 +54,7 @@ public class LegacyVaadinPortlet extends VaadinPortlet {
             // XXX Must update details here so they are available in init.
             session.getBrowser().updateRequestDetails(request);
 
-            Application legacyApplication = getNewApplication(request
+            LegacyApplication legacyApplication = getNewApplication(request
                     .getPortletRequest());
             legacyApplication.doInit();
             session.addUIProvider(legacyApplication);

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.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 public class LegacyVaadinServlet extends VaadinServlet {
 
-    protected Class<? extends Application> getApplicationClass()
+    protected Class<? extends LegacyApplication> getApplicationClass()
             throws ClassNotFoundException {
         try {
             return ServletPortletHelper
@@ -34,10 +34,10 @@ public class LegacyVaadinServlet extends VaadinServlet {
         }
     }
 
-    protected Application getNewApplication(HttpServletRequest request)
+    protected LegacyApplication getNewApplication(HttpServletRequest request)
             throws ServletException {
         try {
-            Class<? extends Application> applicationClass = getApplicationClass();
+            Class<? extends LegacyApplication> applicationClass = getApplicationClass();
             return applicationClass.newInstance();
         } catch (Exception e) {
             throw new ServletException(e);
@@ -60,7 +60,7 @@ public class LegacyVaadinServlet extends VaadinServlet {
             // XXX Must update details here so they are available in init.
             session.getBrowser().updateRequestDetails(request);
 
-            Application legacyApplication = getNewApplication(request);
+            LegacyApplication legacyApplication = getNewApplication(request);
             legacyApplication.doInit();
             session.addUIProvider(legacyApplication);
         }

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.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.ui.UI;
 
@@ -41,7 +41,7 @@ class ServletPortletHelper implements Serializable {
         }
     }
 
-    static Class<? extends Application> getLegacyApplicationClass(
+    static Class<? extends LegacyApplication> getLegacyApplicationClass(
             VaadinService vaadinService) throws ApplicationClassException {
         Properties initParameters = vaadinService.getDeploymentConfiguration()
                 .getInitParameters();
@@ -55,7 +55,7 @@ class ServletPortletHelper implements Serializable {
 
         try {
             return classLoader.loadClass(applicationParameter).asSubclass(
-                    Application.class);
+                    LegacyApplication.class);
         } catch (final ClassNotFoundException e) {
             throw new ApplicationClassException(
                     "Failed to load application class: " + applicationParameter,

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

@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
@@ -90,12 +90,12 @@ 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.Application}
+     * window in Vaadin 6 with {@link com.vaadin.LegacyApplication}
      */
     @Deprecated
     public static class LegacyWindow extends UI {
         private String name;
-        private Application application;
+        private LegacyApplication application;
 
         /**
          * Create a new legacy window
@@ -129,11 +129,11 @@ public abstract class UI extends AbstractComponentContainer implements
             // Just empty
         }
 
-        public void setApplication(Application application) {
+        public void setApplication(LegacyApplication application) {
             this.application = application;
         }
 
-        public Application getApplication() {
+        public LegacyApplication getApplication() {
             return application;
         }
 

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.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
 public class AddRemoveSubWindow {
 
-    public class TestApp extends Application {
+    public class TestApp extends LegacyApplication {
 
         @Override
         public void init() {

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.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.AbstractUIProvider;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.LegacyVaadinServlet;
@@ -105,16 +105,16 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     }
 
     @Override
-    protected Class<? extends Application> getApplicationClass()
+    protected Class<? extends LegacyApplication> getApplicationClass()
             throws ClassNotFoundException {
-        return getClassToRun().asSubclass(Application.class);
+        return getClassToRun().asSubclass(LegacyApplication.class);
     }
 
     @Override
     protected boolean shouldCreateApplication(WrappedHttpServletRequest request)
             throws ServletException {
         try {
-            return Application.class.isAssignableFrom(getClassToRun());
+            return LegacyApplication.class.isAssignableFrom(getClassToRun());
         } catch (ClassNotFoundException e) {
             throw new ServletException(e);
         }
@@ -133,7 +133,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                         return (Class<? extends UI>) classToRun;
                     }
                 });
-            } else if (Application.class.isAssignableFrom(classToRun)) {
+            } else if (LegacyApplication.class.isAssignableFrom(classToRun)) {
                 // Avoid using own UIProvider for legacy Application
             } else if (UIProvider.class.isAssignableFrom(classToRun)) {
                 session.addUIProvider((UIProvider) classToRun.newInstance());

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Components extends LegacyApplication {
 
     private static final Object CAPTION = "c";
     private Map<Class<? extends AbstractComponentTest>, String> tests = new HashMap<Class<? extends AbstractComponentTest>, String>();

uitest/src/com/vaadin/tests/CustomLayoutDemo.java

@@ -43,7 +43,7 @@ import com.vaadin.ui.UI.LegacyWindow;
  * @since 4.0.0
  * 
  */
-public class CustomLayoutDemo extends com.vaadin.Application implements
+public class CustomLayoutDemo extends com.vaadin.LegacyApplication implements
         Listener {
 
     private CustomLayout mainLayout = null;

uitest/src/com/vaadin/tests/LayoutDemo.java

@@ -37,7 +37,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class LayoutDemo extends com.vaadin.Application {
+public class LayoutDemo extends com.vaadin.LegacyApplication {
 
     /**
      * Initialize Application. Demo components are added to main window.

uitest/src/com/vaadin/tests/ListenerOrder.java

@@ -16,7 +16,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class ListenerOrder extends com.vaadin.Application implements
+public class ListenerOrder extends com.vaadin.LegacyApplication implements
         Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener,
         ValueChangeListener {
 

uitest/src/com/vaadin/tests/ModalWindow.java

@@ -34,7 +34,7 @@ import com.vaadin.ui.Window;
  * @see com.vaadin.ui.Window
  * @see com.vaadin.ui.Label
  */
-public class ModalWindow extends com.vaadin.Application implements
+public class ModalWindow extends com.vaadin.LegacyApplication implements
         ClickListener {
 
     private Window test;

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class NativeWindowing extends LegacyApplication {
 
     LegacyWindow main = new LegacyWindow("Windowing test");
 

uitest/src/com/vaadin/tests/Parameters.java

@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @since 3.1.1
  */
-public class Parameters extends com.vaadin.Application implements
+public class Parameters extends com.vaadin.LegacyApplication implements
         RequestHandler {
 
     private final Label context = new Label();

uitest/src/com/vaadin/tests/RandomLayoutStress.java

@@ -42,7 +42,7 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class RandomLayoutStress extends com.vaadin.Application {
+public class RandomLayoutStress extends com.vaadin.LegacyApplication {
 
     private final Random seededRandom = new Random(1);
 

uitest/src/com/vaadin/tests/ScrollbarStressTest.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class ScrollbarStressTest extends LegacyApplication {
 
     final LegacyWindow main = new LegacyWindow("Scrollbar Stress Test");
 

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.Application;
+import com.vaadin.LegacyApplication;
 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.Application implements
+public class TestBench extends com.vaadin.LegacyApplication implements
         Property.ValueChangeListener {
 
     // Add here packages which are used for finding testable classes
@@ -223,7 +223,7 @@ public class TestBench extends com.vaadin.Application implements
 
     private Component createTestable(Class<?> c) {
         try {
-            final Application app = (Application) c.newInstance();
+            final LegacyApplication app = (LegacyApplication) c.newInstance();
             app.doInit();
             Layout lo = (Layout) app.getMainWindow().getContent();
             lo.setParent(null);

uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java

@@ -16,7 +16,7 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
@@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 
 public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends
-        Application {
+        LegacyApplication {
 
     LegacyWindow main = new LegacyWindow("Windowing test");
 

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class TestForNativeWindowing extends LegacyApplication {
 
     LegacyWindow main = new LegacyWindow("Windowing test");
 

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application implements
+public class TestForStyledUpload extends LegacyApplication implements
         Upload.FinishedListener, FailedListener, SucceededListener,
         StartedListener {
 

uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java

@@ -23,7 +23,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class TestSetVisibleAndCaching extends com.vaadin.Application {
+public class TestSetVisibleAndCaching extends com.vaadin.LegacyApplication {
 
     Panel panelA = new Panel("Panel A");
     Panel panelB = new Panel("Panel 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.Application;
+import com.vaadin.LegacyApplication;
 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.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestSizeableIncomponents extends Application {
+public class TestSizeableIncomponents extends LegacyApplication {
 
     private IndexedContainer cont;
     private ComboBox select;

uitest/src/com/vaadin/tests/TestSplitPanel.java

@@ -20,7 +20,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class TestSplitPanel extends com.vaadin.Application {
+public class TestSplitPanel extends com.vaadin.LegacyApplication {
 
     VerticalSplitPanel verticalSplit = new VerticalSplitPanel();
 

uitest/src/com/vaadin/tests/TreeFilesystem.java

@@ -37,7 +37,7 @@ import com.vaadin.ui.UI.LegacyWindow;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystem extends com.vaadin.Application implements
+public class TreeFilesystem extends com.vaadin.LegacyApplication implements
         Tree.ExpandListener {
 
     // Filesystem explorer panel and it's components

uitest/src/com/vaadin/tests/TreeFilesystemContainer.java

@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends com.vaadin.Application implements
+public class TreeFilesystemContainer extends com.vaadin.LegacyApplication implements
         Listener {
 
     // Filesystem explorer panel and it's components

uitest/src/com/vaadin/tests/UsingObjectsInSelect.java

@@ -27,7 +27,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class UsingObjectsInSelect extends com.vaadin.Application implements
+public class UsingObjectsInSelect extends com.vaadin.LegacyApplication implements
         ValueChangeListener {
 
     private final Select select = new Select();

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class GAESyncTest extends LegacyApplication {
 
     /**
      * 
@@ -50,10 +50,10 @@ public class GAESyncTest extends Application {
         private static final long serialVersionUID = -6521351715072191625l;
         TextField tf;
         Label l;
-        Application app;
+        LegacyApplication app;
         GridLayout gl;
 
-        private IntrWindow(Application app) {
+        private IntrWindow(LegacyApplication app) {
 
             this.app = app;
             tf = new TextField("Echo thingie");

uitest/src/com/vaadin/tests/components/AbstractTestCase.java

@@ -1,10 +1,10 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.WebBrowser;
 
-public abstract class AbstractTestCase extends Application {
+public abstract class AbstractTestCase extends LegacyApplication {
 
     protected abstract String getDescription();
 

uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.combobox;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application implements
+public class ComboBoxReapperingOldValue extends LegacyApplication implements
         ValueChangeListener {
 
     ComboBox cbox1 = new ComboBox();

uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.form;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Form;
@@ -9,7 +9,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
 @SuppressWarnings("serial")
-public class UndefinedWideFormWithRelativeWideFooter extends Application {
+public class UndefinedWideFormWithRelativeWideFooter extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java

@@ -1,13 +1,13 @@
 package com.vaadin.tests.components.loginform;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class LoginFormWithMultipleWindows extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;
@@ -10,7 +10,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class LayoutRenderTimeTest extends Application {
+public class LayoutRenderTimeTest extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class TableFirstRowFlicker extends LegacyApplication {
 
     Table t;
 

uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Table;
@@ -8,7 +8,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class TextFieldInLayoutInTable extends Application {
+public class TextFieldInLayoutInTable extends LegacyApplication {
 
     @Override
     public void init() {

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.Application;
+import com.vaadin.LegacyApplication;
 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.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class CheckboxUpdateProblem extends Application implements
+public class CheckboxUpdateProblem extends LegacyApplication implements
         Property.ValueChangeListener {
     private final DatabaseHelper databaseHelper = new DatabaseHelper();
     private Table testList;

uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.containers.sqlcontainer;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class ComboBoxUpdateProblem extends LegacyApplication {
     private final DatabaseHelper databaseHelper = new DatabaseHelper();
 
     @Override

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class MassInsertMemoryLeakTestApp extends LegacyApplication {
 
     ProgressIndicator proggress = new ProgressIndicator();
     Button process = new Button("Mass insert");

uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class IntegrationTestApplication extends LegacyApplication {
 
     @Override
     public void init() {

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class JSR286PortletApplication extends LegacyApplication {
 
     @StyleSheet("PortletConnectorResource.css")
     public final class LegacyWindowWithStylesheet extends LegacyWindow {

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class LiferayThemeDemo extends LegacyApplication {
 
     @SuppressWarnings("deprecation")
     private static final Date DATE = new Date(2009 - 1900, 6 - 1, 2);

uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
@@ -11,7 +11,7 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * See ticket #5521.
  */
-public class PortletSizeInLiferayFreeformLayoutApplication extends Application {
+public class PortletSizeInLiferayFreeformLayoutApplication extends LegacyApplication {
     @Override
     public void init() {
         LegacyWindow mainWindow = new LegacyWindow("Portlet5521 Application");

uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java

@@ -1,12 +1,12 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class GridLayoutInsidePanel2 extends Application {
+public class GridLayoutInsidePanel2 extends LegacyApplication {
 
     private Layout layout;
 

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.Application;
+import com.vaadin.LegacyApplication;
 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(Application application) {
+    public GridLayoutTests(LegacyApplication application) {
         super();
     }
 

uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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(Application application) {
+    public HorizontalLayoutTests(LegacyApplication application) {
         super();
     }
 

uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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(Application application) {
+    public VerticalLayoutTests(LegacyApplication application) {
         super();
     }
 

uitest/src/com/vaadin/tests/themes/ButtonsTest.java

@@ -14,7 +14,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.UI.LegacyWindow;
 
 @SuppressWarnings("serial")
-public class ButtonsTest extends com.vaadin.Application {
+public class ButtonsTest extends com.vaadin.LegacyApplication {
 
     final UI.LegacyWindow main = new LegacyWindow("Button states & themes");
 

uitest/src/com/vaadin/tests/tickets/Ticket1225.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1225 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1230.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1230 extends Application {
+public class Ticket1230 extends LegacyApplication {
 
     private static final Object PROPERTY_ID = new Object();
     private static final Object NULL_ITEM_ID = new Object();

uitest/src/com/vaadin/tests/tickets/Ticket124.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket124 extends Application {
+public class Ticket124 extends LegacyApplication {
 
     private TextField tf;
     private GridLayout gl;

uitest/src/com/vaadin/tests/tickets/Ticket1245.java

@@ -11,7 +11,7 @@ import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class Ticket1245 extends com.vaadin.Application {
+public class Ticket1245 extends com.vaadin.LegacyApplication {
 
     TextField f = new TextField();
 

uitest/src/com/vaadin/tests/tickets/Ticket1365.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1365 extends com.vaadin.Application implements Handler {
+public class Ticket1365 extends com.vaadin.LegacyApplication implements Handler {
 
     TextField f = new TextField();
 

uitest/src/com/vaadin/tests/tickets/Ticket1368.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Table;
@@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  */
-public class Ticket1368 extends Application {
+public class Ticket1368 extends LegacyApplication {
 
     private Table t;
 

uitest/src/com/vaadin/tests/tickets/Ticket1397.java

@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -14,7 +14,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1397 extends Application {
+public class Ticket1397 extends LegacyApplication {
 
     LegacyWindow main;
 

uitest/src/com/vaadin/tests/tickets/Ticket1435.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -16,7 +16,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1435 extends Application {
+public class Ticket1435 extends LegacyApplication {
 
     private static final boolean useWorkaround = true;
 

uitest/src/com/vaadin/tests/tickets/Ticket1444.java

@@ -1,12 +1,12 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1444 extends Application {
+public class Ticket1444 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1465ModalNotification extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1519.java

@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1519 extends Application {
+public class Ticket1519 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1572.java

@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1572 extends com.vaadin.Application {
+public class Ticket1572 extends com.vaadin.LegacyApplication {
 
     private Label state;
     private GridLayout gl;

uitest/src/com/vaadin/tests/tickets/Ticket1581.java

@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1581 extends com.vaadin.Application {
+public class Ticket1581 extends com.vaadin.LegacyApplication {
 
     private Label time;
     private ProgressIndicator poller;

uitest/src/com/vaadin/tests/tickets/Ticket1589.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1589 extends LegacyApplication {
 
     @Override
     public void init() {

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1598 extends LegacyApplication {
 
     LegacyWindow main = new LegacyWindow("MenuBar test");
 

uitest/src/com/vaadin/tests/tickets/Ticket161.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Button;
@@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  */
-public class Ticket161 extends Application {
+public class Ticket161 extends LegacyApplication {
 
     private Table t;
 

uitest/src/com/vaadin/tests/tickets/Ticket1632.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  */
-public class Ticket1632 extends Application {
+public class Ticket1632 extends LegacyApplication {
 
     private Table t;
 

uitest/src/com/vaadin/tests/tickets/Ticket1659.java

@@ -1,12 +1,12 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1659 extends Application {
+public class Ticket1659 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1663.java

@@ -4,7 +4,7 @@ import com.vaadin.server.SystemError;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1663 extends com.vaadin.Application {
+public class Ticket1663 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1673.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1673 extends com.vaadin.Application {
+public class Ticket1673 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1710.java

@@ -28,7 +28,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1710 extends com.vaadin.Application {
+public class Ticket1710 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1737.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1737 extends LegacyApplication {
 
     Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") {
         @Override

uitest/src/com/vaadin/tests/tickets/Ticket1767.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1767 extends com.vaadin.Application {
+public class Ticket1767 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1772.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1772 extends com.vaadin.Application {
+public class Ticket1772 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1775.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1775 extends com.vaadin.Application {
+public class Ticket1775 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1804.java

@@ -15,7 +15,7 @@ import com.vaadin.ui.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
-public class Ticket1804 extends com.vaadin.Application {
+public class Ticket1804 extends com.vaadin.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1805.java

@@ -10,7 +10,7 @@ import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1805 extends com.vaadin.Application {
+public class Ticket1805 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1806.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1806 extends com.vaadin.Application {
+public class Ticket1806 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1811.java

@@ -13,7 +13,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
-public class Ticket1811 extends com.vaadin.Application {
+public class Ticket1811 extends com.vaadin.LegacyApplication {
 
     LinkedList<TextField> listOfAllFields = new LinkedList<TextField>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1819.java

@@ -12,7 +12,7 @@ import com.vaadin.ui.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Window;
 
-public class Ticket1819 extends com.vaadin.Application {
+public class Ticket1819 extends com.vaadin.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java

@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1834PanelScrolling extends com.vaadin.Application {
+public class Ticket1834PanelScrolling extends com.vaadin.LegacyApplication {
 
     private static final int ROWS = 50;
 

uitest/src/com/vaadin/tests/tickets/Ticket1857.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application implements Handler {
+public class Ticket1857 extends LegacyApplication implements Handler {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1868.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1868 extends com.vaadin.Application {
+public class Ticket1868 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1869.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1869 extends com.vaadin.Application {
+public class Ticket1869 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

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.Application;
+import com.vaadin.LegacyApplication;
 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.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1878 extends Application {
+public class Ticket1878 extends LegacyApplication {
 
     private Layout orderedLayout;
     private Layout gridLayout;

uitest/src/com/vaadin/tests/tickets/Ticket1900.java

@@ -1,13 +1,13 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1900 extends Application {
+public class Ticket1900 extends LegacyApplication {
 
     TextField f[] = new TextField[5];
     LegacyWindow main = new LegacyWindow("#1900 test");

uitest/src/com/vaadin/tests/tickets/Ticket1904.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1904 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1916.java

@@ -1,13 +1,13 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1916 extends Application {
+public class Ticket1916 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1919.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1919 extends com.vaadin.Application {
+public class Ticket1919 extends com.vaadin.LegacyApplication {
 
     private GridLayout lo;
     private boolean on = true;

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.Application;
+import com.vaadin.LegacyApplication;
 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 Application implements RequestHandler {
+public class Ticket1921 extends LegacyApplication implements RequestHandler {
 
     int state = -1;
     int round = 1;

uitest/src/com/vaadin/tests/tickets/Ticket1923.java

@@ -5,7 +5,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1923 extends com.vaadin.Application {
+public class Ticket1923 extends com.vaadin.LegacyApplication {
 
     private static final int ROWS = 50;
 

uitest/src/com/vaadin/tests/tickets/Ticket1925.java

@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1925 extends Application {
+public class Ticket1925 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1939.java

@@ -1,13 +1,13 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1939 extends Application {
+public class Ticket1939 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1940.java

@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1940 extends Application {
+public class Ticket1940 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1953.java

@@ -1,12 +1,12 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1953 extends Application {
+public class Ticket1953 extends LegacyApplication {
     public static final String cellStyle = "test-cell";
     public static final String colHeadStyle = "test-col-head";
     public static final String headingStyle = "test-heading";

uitest/src/com/vaadin/tests/tickets/Ticket1966.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1966 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1966_2 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
@@ -10,7 +10,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1966_3 extends Application {
+public class Ticket1966_3 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1969.java

@@ -10,7 +10,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1969 extends com.vaadin.Application {
+public class Ticket1969 extends com.vaadin.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1970.java

@@ -2,14 +2,14 @@ package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 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 Application {
+public class Ticket1970 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1972.java

@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket1972 extends Application {
+public class Ticket1972 extends LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1973.java

@@ -8,7 +8,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1973 extends com.vaadin.Application {
+public class Ticket1973 extends com.vaadin.LegacyApplication {
 
     LegacyWindow main = new LegacyWindow();
     Table table = new Table();

uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.ui.Button;
@@ -9,7 +9,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1973_2 extends Application {
+public class Ticket1973_2 extends LegacyApplication {
     LegacyWindow main = new LegacyWindow();
     Table table = new Table();