Rename LegacyApplication -> Application (#9402)

6 files changed, 17 insertions, 17 deletions

diff --git a/server/src/com/vaadin/LegacyApplication.java b/server/src/com/vaadin/Application.java
index 66b2ca3973..13ce23d1e4 100644
--- a/server/src/com/vaadin/LegacyApplication.java
+++ b/server/src/com/vaadin/Application.java
@@ -44,7 +44,7 @@ import com.vaadin.ui.UI;
  * @since 7.0
  */
 @Deprecated
-public abstract class LegacyApplication extends AbstractUIProvider implements
+public abstract class Application 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 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<? extends LegacyApplication> getApplicationClass()
+    protected Class<? extends Application> 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<? extends LegacyApplication> applicationClass = getApplicationClass();
+            Class<? extends Application> 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<? extends LegacyApplication> getApplicationClass()
+    protected Class<? extends Application> 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<? extends LegacyApplication> applicationClass = getApplicationClass();
+            Class<? extends Application> 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<? extends LegacyApplication> getLegacyApplicationClass(
+    static Class<? extends Application> 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() {