Rename WebApplicationContext -> ServletApplicationContext (#9402)

4 files changed, 8 insertions, 10 deletions

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 8a07168ef7..f4cf236a24 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests;
 
-import com.vaadin.server.WebApplicationContext;
+import com.vaadin.server.ApplicationContext;
 import com.vaadin.server.WebBrowser;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
@@ -9,7 +9,7 @@ public class VerifyBrowserVersion extends TestBase {
 
     @Override
     protected void setup() {
-        WebApplicationContext context = (WebApplicationContext) getContext();
+        ApplicationContext context = getContext();
         WebBrowser browser = context.getBrowser();
         addComponent(new Label(browser.getBrowserApplication()));
         addComponent(new Label("Touch device? "
diff --git a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
index 233da9722e..1f5f0dc691 100644
--- a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.application;
 
 import com.vaadin.Application;
-import com.vaadin.server.WebApplicationContext;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
@@ -16,8 +15,7 @@ public class ApplicationCloseTest extends TestBase {
     protected void setup() {
         Label applications = new Label("Applications in session: <br/>",
                 ContentMode.XHTML);
-        for (Application a : ((WebApplicationContext) getContext())
-                .getApplications()) {
+        for (Application a : getContext().getApplications()) {
             applications.setValue(applications.getValue() + "App: " + a
                     + "<br/>");
         }
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 9146cf5dea..96ebe1345f 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.applicationcontext;
 
-import com.vaadin.server.WebApplicationContext;
+import com.vaadin.server.ServletApplicationContext;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
@@ -32,7 +32,7 @@ public class ChangeSessionId extends AbstractTestCase {
         loginButton.addListener(new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                WebApplicationContext context = ((WebApplicationContext) getContext());
+                ServletApplicationContext context = ((ServletApplicationContext) getContext());
 
                 String oldSessionId = context.getHttpSession().getId();
                 context.reinitializeSession();
@@ -55,7 +55,7 @@ public class ChangeSessionId extends AbstractTestCase {
     }
 
     protected String getSessionId() {
-        return ((WebApplicationContext) getContext()).getHttpSession().getId();
+        return ((ServletApplicationContext) getContext()).getHttpSession().getId();
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index 9c6dd8c272..e85fe294f2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -5,7 +5,7 @@ import java.io.File;
 import java.io.FileInputStream;
 
 import com.vaadin.Application;
-import com.vaadin.server.WebApplicationContext;
+import com.vaadin.server.ServletApplicationContext;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -33,7 +33,7 @@ public class Ticket1975 extends Application.LegacyApplication {
         try {
             cl1 = new CustomLayout(new ByteArrayInputStream(s.getBytes()));
             layout.addComponent(cl1);
-            WebApplicationContext wc = ((WebApplicationContext) getContext());
+            ServletApplicationContext wc = ((ServletApplicationContext) getContext());
 
             layout.addComponent(new Button("Disable/Enable",
                     new ClickListener() {