summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-07 13:47:51 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-07 13:48:25 +0300
commit7cf781eaf62f145d96a562c945232c32c74df263 (patch)
tree0584391263c86f657a8bf9065fd92d11c54030d5 /uitest/src/com/vaadin/launcher
parentcf99cbc9e1f556fa89f5b1ced39eaca3f119f733 (diff)
downloadvaadin-framework-7cf781eaf62f145d96a562c945232c32c74df263.tar.gz
vaadin-framework-7cf781eaf62f145d96a562c945232c32c74df263.zip
Rename Application back to LegacyApplication (#9402)
Diffstat (limited to 'uitest/src/com/vaadin/launcher')
-rw-r--r--uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java10
1 files changed, 5 insertions, 5 deletions
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<? 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());