diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-09-06 16:58:43 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-09-06 17:07:49 +0300 |
commit | 4011783ed51dffe80ceb5642c02d65033de6d400 (patch) | |
tree | 46f43c481fde0b06c443269f7c84ee180ae48f2e /uitest | |
parent | a64b703b2bd714f8ff1c6cfd1b8b89908e502691 (diff) | |
download | vaadin-framework-4011783ed51dffe80ceb5642c02d65033de6d400.tar.gz vaadin-framework-4011783ed51dffe80ceb5642c02d65033de6d400.zip |
Remove Application from UIProvider API (#9402)
Diffstat (limited to 'uitest')
4 files changed, 8 insertions, 13 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index b483a9fd9d..029bebd9c9 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -35,7 +35,6 @@ import com.vaadin.server.DeploymentConfiguration; import com.vaadin.server.LegacyVaadinServlet; import com.vaadin.server.UIProvider; import com.vaadin.server.VaadinServletSession; -import com.vaadin.server.VaadinSession; import com.vaadin.server.WrappedHttpServletRequest; import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.TestBase; @@ -122,7 +121,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { @Override public Class<? extends UI> getUIClass( - VaadinSession application, WrappedRequest request) { + WrappedRequest request) { return (Class<? extends UI>) classToRun; } }); diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java index 5278fb0073..c8c6911c1a 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -20,14 +20,13 @@ public class LazyInitUIs extends AbstractTestUIProvider { } @Override - public UI createInstance(VaadinSession application, - Class<? extends UI> type, WrappedRequest request) { + public UI createInstance(Class<? extends UI> type, + WrappedRequest request) { return getUI(request); } @Override - public Class<? extends UI> getUIClass(VaadinSession application, - WrappedRequest request) { + public Class<? extends UI> getUIClass(WrappedRequest request) { return getUI(request).getClass(); } diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java index 19c85a729d..2d27989dd4 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java @@ -32,8 +32,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider { } @Override - public Class<? extends UI> getUIClass(VaadinSession application, - WrappedRequest request) { + public Class<? extends UI> getUIClass(WrappedRequest request) { return TabUI.class; } diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 0cb2587082..5a8d8a8ea1 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -17,7 +17,6 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.AbstractUIProvider; -import com.vaadin.server.VaadinSession; import com.vaadin.server.WebBrowser; import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; @@ -34,8 +33,7 @@ import com.vaadin.ui.UI; public class DifferentFeaturesForDifferentClients extends AbstractUIProvider { @Override - public Class<? extends UI> getUIClass(VaadinSession application, - WrappedRequest request) { + public Class<? extends UI> getUIClass(WrappedRequest request) { // could also use browser version etc. if (request.getHeader("user-agent").contains("mobile")) { return TouchRoot.class; @@ -47,8 +45,8 @@ public class DifferentFeaturesForDifferentClients extends AbstractUIProvider { // Must override as default implementation isn't allowed to // instantiate our non-public classes @Override - public UI createInstance(VaadinSession application, - Class<? extends UI> type, WrappedRequest request) { + public UI createInstance(Class<? extends UI> type, + WrappedRequest request) { try { return type.newInstance(); } catch (Exception e) { |