Rename Application back to LegacyApplication (#9402)

6 files changed, 21 insertions, 21 deletions

diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/LegacyApplication.java
index c439d30425..a1aeb037fd 100644
--- a/server/src/com/vaadin/Application.java
+++ b/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 /
diff --git a/server/src/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/com/vaadin/server/LegacyVaadinPortlet.java
index efc341f369..067ef888b1 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.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);
diff --git a/server/src/com/vaadin/server/LegacyVaadinServlet.java b/server/src/com/vaadin/server/LegacyVaadinServlet.java
index 359f18905c..4cdb66db44 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.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);
         }
diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index e7e4c813ce..7f4a05deef 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.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,
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 7ef51dfc3e..ef77142312 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/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;
         }
 
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 2e59f9ee41..9ee4ffe6e7 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.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() {