diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-09-27 16:14:07 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-09-28 14:14:33 +0300 |
commit | af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec (patch) | |
tree | c32c0abdadecc7d2af43abdb03cf907feb043af2 /uitest/src/com | |
parent | 01ff5a924b8fdeeda8cbd21973fc1ecd206ef043 (diff) | |
download | vaadin-framework-af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec.tar.gz vaadin-framework-af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec.zip |
Rename VaadinSession -> VaadinServiceSession (#9733)
Change-Id: I4472cebf2f9f4cf3e0dea31a0dda8dc892323c5c
Diffstat (limited to 'uitest/src/com')
18 files changed, 53 insertions, 49 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index 0269982963..f6f1add940 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -38,9 +38,9 @@ import com.vaadin.server.SessionInitListener; import com.vaadin.server.UIClassSelectionEvent; import com.vaadin.server.UIProvider; import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.server.VaadinServletRequest; import com.vaadin.server.VaadinServletService; -import com.vaadin.server.VaadinSession; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.UI; @@ -137,7 +137,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } protected void onVaadinSessionStarted(VaadinRequest request, - VaadinSession session) throws ServiceException { + VaadinServiceSession session) throws ServiceException { try { final Class<?> classToRun = getClassToRun(); if (UI.class.isAssignableFrom(classToRun)) { diff --git a/uitest/src/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java index 8c7a0f1e03..174fbd64da 100644 --- a/uitest/src/com/vaadin/tests/ModalWindow.java +++ b/uitest/src/com/vaadin/tests/ModalWindow.java @@ -30,7 +30,7 @@ import com.vaadin.ui.Window; * * @author Vaadin Ltd. * @since 4.0.1 - * @see com.vaadin.server.VaadinSession + * @see com.vaadin.server.VaadinServiceSession * @see com.vaadin.ui.Window * @see com.vaadin.ui.Label */ diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java index 45a3ae311a..dd7f6a1a7e 100644 --- a/uitest/src/com/vaadin/tests/Parameters.java +++ b/uitest/src/com/vaadin/tests/Parameters.java @@ -25,7 +25,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Link; @@ -56,7 +56,7 @@ public class Parameters extends com.vaadin.LegacyApplication implements setMainWindow(main); // This class acts both as URI handler and parameter handler - VaadinSession.getCurrent().addRequestHandler(this); + VaadinServiceSession.getCurrent().addRequestHandler(this); final VerticalLayout layout = new VerticalLayout(); final Label info = new Label("To test URI and Parameter Handlers, " @@ -106,8 +106,8 @@ public class Parameters extends com.vaadin.LegacyApplication implements } @Override - public boolean handleRequest(VaadinSession session, VaadinRequest request, - VaadinResponse response) throws IOException { + public boolean handleRequest(VaadinServiceSession session, + VaadinRequest request, VaadinResponse response) throws IOException { context.setValue("Context not available"); relative.setValue(request.getRequestPathInfo()); diff --git a/uitest/src/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java index c886fc2c40..91e3afd993 100644 --- a/uitest/src/com/vaadin/tests/TestBench.java +++ b/uitest/src/com/vaadin/tests/TestBench.java @@ -311,7 +311,7 @@ public class TestBench extends com.vaadin.LegacyApplication implements final Class<?> c = Class.forName(p); if (c.getSuperclass() != null) { if ((c.getSuperclass() - .equals(com.vaadin.server.VaadinSession.class))) { + .equals(com.vaadin.server.VaadinServiceSession.class))) { classes.add(c); } else if ((c.getSuperclass() .equals(com.vaadin.ui.CustomComponent.class))) { diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java index 4183f8a243..230d9441ad 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.io.File; import com.vaadin.data.Item; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; @@ -63,7 +63,7 @@ public class TreeFilesystem extends com.vaadin.LegacyApplication implements // Get sample directory final File sampleDir = SampleDirectory.getDirectory( - VaadinSession.getCurrent(), main); + VaadinServiceSession.getCurrent(), main); // populate tree's root node with example directory if (sampleDir != null) { populateNode(sampleDir.getAbsolutePath(), null); diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java index b81b14365c..546262fbd9 100644 --- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java @@ -20,7 +20,7 @@ import java.io.File; import com.vaadin.data.util.FilesystemContainer; import com.vaadin.data.util.FilesystemContainer.FileItem; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Component.Event; import com.vaadin.ui.Component.Listener; @@ -79,7 +79,7 @@ public class TreeFilesystemContainer extends com.vaadin.LegacyApplication // Get sample directory final File sampleDir = SampleDirectory.getDirectory( - VaadinSession.getCurrent(), w); + VaadinServiceSession.getCurrent(), w); // Populate tree with FilesystemContainer final FilesystemContainer fsc = new FilesystemContainer(sampleDir, true); filesystem.setContainerDataSource(fsc); diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java index f2d2c2f595..a043da7774 100644 --- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java @@ -3,7 +3,7 @@ package com.vaadin.tests.application; import com.vaadin.server.DownloadStream; import com.vaadin.server.PaintException; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.integration.FlagSeResource; import com.vaadin.tests.util.Log; @@ -14,7 +14,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.UI.LegacyWindow; public class ThreadLocalInstances extends AbstractTestCase { - private static final VaadinSession staticInitApplication = VaadinSession + private static final VaadinServiceSession staticInitApplication = VaadinServiceSession .getCurrent(); private static final UI staticInitRoot = UI.getCurrent(); @@ -90,10 +90,11 @@ public class ThreadLocalInstances extends AbstractTestCase { } private void reportCurrentStatus(String phase) { - reportStatus(phase, VaadinSession.getCurrent(), UI.getCurrent()); + reportStatus(phase, VaadinServiceSession.getCurrent(), UI.getCurrent()); } - private void reportStatus(String phase, VaadinSession application, UI uI) { + private void reportStatus(String phase, VaadinServiceSession application, + UI uI) { log.log(getState(application, this) + " app in " + phase); log.log(getState(uI, mainWindow) + " root in " + phase); } diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java index 356b130433..67f61944fb 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components; import com.vaadin.LegacyApplication; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.server.WebBrowser; public abstract class AbstractTestCase extends LegacyApplication { @@ -11,7 +11,7 @@ public abstract class AbstractTestCase extends LegacyApplication { protected abstract Integer getTicketNumber(); protected WebBrowser getBrowser() { - WebBrowser webBrowser = VaadinSession.getCurrent().getBrowser(); + WebBrowser webBrowser = VaadinServiceSession.getCurrent().getBrowser(); return webBrowser; } diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java b/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java index 9ad6bbf56f..2bb460e8b5 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components; import com.vaadin.server.UIProvider; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.server.WebBrowser; public abstract class AbstractTestUIProvider extends UIProvider { @@ -10,7 +10,7 @@ public abstract class AbstractTestUIProvider extends UIProvider { protected abstract Integer getTicketNumber(); protected WebBrowser getBrowser() { - WebBrowser webBrowser = VaadinSession.getCurrent().getBrowser(); + WebBrowser webBrowser = VaadinServiceSession.getCurrent().getBrowser(); return webBrowser; } } diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java index 2eef498aff..971bd1cbe3 100644 --- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java +++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java @@ -8,7 +8,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractField; @@ -55,7 +55,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase } protected void updateLocale(Locale locale) { - VaadinSession.getCurrent().setLocale(locale); + VaadinServiceSession.getCurrent().setLocale(locale); for (Component c : fields) { removeComponent(c); } diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java index 9524a41cd8..4d4d96a465 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -5,7 +5,7 @@ import com.vaadin.server.UIClassSelectionEvent; import com.vaadin.server.UICreateEvent; import com.vaadin.server.UIProviderEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUIProvider; import com.vaadin.ui.Label; @@ -54,14 +54,16 @@ public class LazyInitUIs extends AbstractTestUIProvider { addComponent(getRequestInfo("NormalUI", request)); Link lazyCreateLink = new Link("Open lazyCreate UI", - new ExternalResource(VaadinSession.getCurrent() - .getURL() + "?lazyCreate#lazyCreate")); + new ExternalResource(VaadinServiceSession + .getCurrent().getURL() + + "?lazyCreate#lazyCreate")); lazyCreateLink.setTargetName("_blank"); addComponent(lazyCreateLink); Link lazyInitLink = new Link("Open eagerInit UI", - new ExternalResource(VaadinSession.getCurrent() - .getURL() + "?eagerInit#eagerInit")); + new ExternalResource(VaadinServiceSession + .getCurrent().getURL() + + "?eagerInit#eagerInit")); lazyInitLink.setTargetName("_blank"); addComponent(lazyInitLink); } diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java index 942e5ed1ef..8c4ba3980d 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java @@ -5,19 +5,20 @@ import java.util.concurrent.atomic.AtomicInteger; import com.vaadin.server.UIClassSelectionEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.tests.components.AbstractTestUIProvider; import com.vaadin.ui.Label; import com.vaadin.ui.UI; public class UIsInMultipleTabs extends AbstractTestUIProvider { // No cleanup -> will leak, but shouldn't matter for tests - private static ConcurrentHashMap<VaadinSession, AtomicInteger> numberOfUIsOpened = new ConcurrentHashMap<VaadinSession, AtomicInteger>(); + private static ConcurrentHashMap<VaadinServiceSession, AtomicInteger> numberOfUIsOpened = new ConcurrentHashMap<VaadinServiceSession, AtomicInteger>(); public static class TabUI extends UI { @Override protected void init(VaadinRequest request) { - VaadinSession application = VaadinSession.getCurrent(); + VaadinServiceSession application = VaadinServiceSession + .getCurrent(); AtomicInteger count = numberOfUIsOpened.get(application); if (count == null) { numberOfUIsOpened.putIfAbsent(application, new AtomicInteger()); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java index 3d73c3fe98..4c9ba80677 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java @@ -11,7 +11,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Embedded; @@ -56,8 +56,8 @@ class DynamicImageRequestHandler implements RequestHandler { public static final String IMAGE_URL = "myimage.png"; @Override - public boolean handleRequest(VaadinSession session, VaadinRequest request, - VaadinResponse response) throws IOException { + public boolean handleRequest(VaadinServiceSession session, + VaadinRequest request, VaadinResponse response) throws IOException { String pathInfo = request.getRequestPathInfo(); if (("/" + IMAGE_URL).equals(pathInfo)) { // Create an image, draw the "text" parameter to it and output it to diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java index 2df38d7b33..ebacb2f672 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -41,7 +41,7 @@ public class FindCurrentUI extends UI { @Override public void buttonClick(ClickEvent event) { String msg = "Running in "; - msg += VaadinSession.getCurrent().getConfiguration() + msg += VaadinServiceSession.getCurrent().getConfiguration() .isProductionMode() ? "production" : "debug"; Notification.show(msg); } diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java index 62ceceeefb..8bc1e749a6 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java @@ -16,7 +16,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; @@ -29,7 +29,7 @@ public class Ticket1589 extends LegacyApplication { MyDynamicResource res = new MyDynamicResource(); - VaadinSession.getCurrent().addRequestHandler(res); + VaadinServiceSession.getCurrent().addRequestHandler(res); w.addComponent(new Link( "Test (without Content-Disposition, should suggest generatedFile.png when saving, browser default for actual disposition)", @@ -52,8 +52,8 @@ class MyDynamicResource implements RequestHandler { * stream that contains the response from the server. */ @Override - public boolean handleRequest(VaadinSession session, VaadinRequest request, - VaadinResponse response) throws IOException { + public boolean handleRequest(VaadinServiceSession session, + VaadinRequest request, VaadinResponse response) throws IOException { String relativeUri = request.getRequestPathInfo(); // Catch the given URI that identifies the resource, otherwise let other // URI handlers or the Application to handle the response. diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java index 976bebd7cb..5fe63591ff 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java @@ -7,7 +7,7 @@ import com.vaadin.LegacyApplication; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -42,7 +42,7 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler { newState(); - VaadinSession.getCurrent().addRequestHandler(this); + VaadinServiceSession.getCurrent().addRequestHandler(this); } public void newState() { @@ -94,8 +94,8 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler { } @Override - public boolean handleRequest(VaadinSession session, VaadinRequest request, - VaadinResponse response) throws IOException { + public boolean handleRequest(VaadinServiceSession session, + VaadinRequest request, VaadinResponse response) throws IOException { Map<String, String[]> parameters = request.getParameterMap(); String[] s = parameters.get("state"); if (s == null || s.length != 1) { diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java index 20047df2ee..38cd84ff01 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java @@ -14,7 +14,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; @@ -44,12 +44,12 @@ public class Ticket2292 extends com.vaadin.LegacyApplication implements Link l = new Link("l", icon); main.addComponent(l); - VaadinSession.getCurrent().addRequestHandler(this); + VaadinServiceSession.getCurrent().addRequestHandler(this); } @Override - public boolean handleRequest(VaadinSession session, VaadinRequest request, - VaadinResponse response) throws IOException { + public boolean handleRequest(VaadinServiceSession session, + VaadinRequest request, VaadinResponse response) throws IOException { String relativeUri = request.getRequestPathInfo(); if (!relativeUri.contains("icon.png")) { diff --git a/uitest/src/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java index 5c45e0d64e..504a4e5dfd 100644 --- a/uitest/src/com/vaadin/tests/util/SampleDirectory.java +++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java @@ -20,7 +20,7 @@ import java.io.File; import com.vaadin.server.SystemError; import com.vaadin.server.VaadinService; -import com.vaadin.server.VaadinSession; +import com.vaadin.server.VaadinServiceSession; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -42,7 +42,7 @@ public class SampleDirectory { * @param application * @return file pointing to sample directory */ - public static File getDirectory(VaadinSession application, UI uI) { + public static File getDirectory(VaadinServiceSession application, UI uI) { String errorMessage = "Access to application " + "context base directory failed, " + "possible security constraint with Application " |