From 7cf781eaf62f145d96a562c945232c32c74df263 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 7 Sep 2012 13:47:51 +0300 Subject: Rename Application back to LegacyApplication (#9402) --- uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'uitest/src/com/vaadin/launcher') diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index df7c9c5db9..032957bffc 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.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 getApplicationClass() + protected Class 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) 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()); -- cgit v1.2.3