diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:51:40 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:51:40 +0300 |
| commit | aa20ecbfb7cebb719a05ec1be6439badd228366e (patch) | |
| tree | deb47fed4553a8885b3d9f4540cf36a50d710fd1 /uitest | |
| parent | cb474f17b6de48f85287491ba24f4c8975c62b0f (diff) | |
| download | vaadin-framework-aa20ecbfb7cebb719a05ec1be6439badd228366e.tar.gz vaadin-framework-aa20ecbfb7cebb719a05ec1be6439badd228366e.zip | |
Rename getVaadinXyz() methods to getXyz() (#9726)
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index 4ff5624ba1..269080a59c 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -64,7 +64,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { Collections.addAll(defaultPackages, initParameter.split(",")); } String str = TestBase.class.getName().replace('.', '/') + ".class"; - URL url = getVaadinService().getClassLoader().getResource(str); + URL url = getService().getClassLoader().getResource(str); if ("file".equals(url.getProtocol())) { File comVaadinTests = new File(url.getPath()).getParentFile() .getParentFile(); @@ -76,14 +76,14 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { @Override protected void servletInitialized() { super.servletInitialized(); - getVaadinService().addVaadinSessionInitializationListener( + getService().addVaadinSessionInitializationListener( new VaadinSessionInitializationListener() { @Override public void vaadinSessionInitialized( VaadinSessionInitializeEvent event) throws ServiceException { onVaadinSessionStarted(event.getRequest(), - event.getVaadinSession()); + event.getSession()); } }); } @@ -144,7 +144,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { try { final Class<?> classToRun = getClassToRun(); if (UI.class.isAssignableFrom(classToRun)) { - getVaadinService().addUIProvider(session, new UIProvider() { + getService().addUIProvider(session, new UIProvider() { @Override public Class<? extends UI> getUIClass( UIClassSelectionEvent event) { @@ -154,7 +154,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } else if (LegacyApplication.class.isAssignableFrom(classToRun)) { // Avoid using own UIProvider for legacy Application } else if (UIProvider.class.isAssignableFrom(classToRun)) { - getVaadinService().addUIProvider(session, + getService().addUIProvider(session, (UIProvider) classToRun.newInstance()); } else { throw new ServiceException(classToRun.getCanonicalName() @@ -311,7 +311,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { @Override protected VaadinServletRequest createVaadinRequest( HttpServletRequest request) { - return new VaadinServletRequest(request, getVaadinService()) { + return new VaadinServletRequest(request, getService()) { @Override public String getRequestPathInfo() { return ApplicationRunnerServlet.this.getRequestPathInfo(this); |