diff options
Diffstat (limited to 'uitest/src/com/vaadin')
75 files changed, 177 insertions, 177 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index c27e92626a..1323e247d9 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -38,8 +38,8 @@ import com.vaadin.server.UIProvider; import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinSessionInitializationListener; import com.vaadin.server.VaadinSessionInitializeEvent; -import com.vaadin.server.WrappedHttpServletRequest; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinServletRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.UI; @@ -138,7 +138,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } } - protected void onVaadinSessionStarted(WrappedRequest request, + protected void onVaadinSessionStarted(VaadinRequest request, VaadinSession session) throws ServiceException { try { final Class<?> classToRun = getClassToRun(); @@ -146,7 +146,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { session.addUIProvider(new AbstractUIProvider() { @Override - public Class<? extends UI> getUIClass(WrappedRequest request) { + public Class<? extends UI> getUIClass(VaadinRequest request) { return (Class<? extends UI>) classToRun; } }); @@ -166,7 +166,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { throw new ServiceException( new InstantiationException( "Failed to load application class: " - + getApplicationRunnerApplicationClassName(WrappedHttpServletRequest + + getApplicationRunnerApplicationClassName(VaadinServletRequest .cast(request)))); } } @@ -293,8 +293,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { DeploymentConfiguration deploymentConfiguration) { return new ServletService(this, deploymentConfiguration) { @Override - public String getStaticFileLocation(WrappedRequest request) { - URIS uris = getApplicationRunnerURIs(WrappedHttpServletRequest + public String getStaticFileLocation(VaadinRequest request) { + URIS uris = getApplicationRunnerURIs(VaadinServletRequest .cast(request)); String staticFilesPath = uris.staticFilesPath; if (staticFilesPath.equals("/")) { @@ -307,9 +307,9 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } @Override - protected WrappedHttpServletRequest createWrappedRequest( + protected VaadinServletRequest createVaadinRequest( HttpServletRequest request) { - return new WrappedHttpServletRequest(request, getVaadinService()) { + return new VaadinServletRequest(request, getVaadinService()) { @Override public String getRequestPathInfo() { return ApplicationRunnerServlet.this.getRequestPathInfo(this); diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java index fe5f5e14ae..300573424e 100644 --- a/uitest/src/com/vaadin/tests/Parameters.java +++ b/uitest/src/com/vaadin/tests/Parameters.java @@ -24,8 +24,8 @@ import java.util.Map; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Link; @@ -107,7 +107,7 @@ public class Parameters extends com.vaadin.LegacyApplication implements @Override public boolean handleRequest(VaadinSession session, - WrappedRequest request, WrappedResponse response) + VaadinRequest request, VaadinResponse response) throws IOException { context.setValue("Context not available"); relative.setValue(request.getRequestPathInfo()); diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java index d812ea644a..8f8c339383 100644 --- a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java +++ b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java @@ -16,14 +16,14 @@ package com.vaadin.tests; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; public class VerifyAssertionsEnabled extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { try { assert false; addComponent(new Label("Assertions are not enabled")); diff --git a/uitest/src/com/vaadin/tests/application/HelloWorld.java b/uitest/src/com/vaadin/tests/application/HelloWorld.java index c46ef7fc9f..28115c0cb9 100644 --- a/uitest/src/com/vaadin/tests/application/HelloWorld.java +++ b/uitest/src/com/vaadin/tests/application/HelloWorld.java @@ -1,6 +1,6 @@ package com.vaadin.tests.application; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; /** @@ -10,7 +10,7 @@ import com.vaadin.ui.UI; public class HelloWorld extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { // Type your code here... } diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java index 13ceceab6c..5e406a5c98 100644 --- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java +++ b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java @@ -1,7 +1,7 @@ package com.vaadin.tests.application; import com.vaadin.annotations.PreserveOnRefresh; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; public class RefreshStatePreserve extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new Label("window.name: " + request.getBrowserDetails().getWindowName())); addComponent(new Label("UI id: " + getUIId())); diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java index 688b2ea4f5..7d755a942b 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.VaadinSession; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.integration.FlagSeResource; import com.vaadin.tests.util.Log; @@ -22,7 +22,7 @@ public class ThreadLocalInstances extends AbstractTestCase { boolean paintReported = false; @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { reportCurrentStatus("root init"); } diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java index ad48ef05ad..1b8378ea31 100644 --- a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java +++ b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java @@ -16,7 +16,7 @@ package com.vaadin.tests.application; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -27,7 +27,7 @@ public class VaadinSessionAttribute extends AbstractTestUI { private static final String ATTR_NAME = "myAttribute"; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { getSession().setAttribute(ATTR_NAME, Integer.valueOf(42)); getSession().setAttribute(Integer.class, Integer.valueOf(42 * 2)); diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java index 6d84b85ff8..4c4dff572a 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components; import com.vaadin.server.WebBrowser; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Label; @@ -11,7 +11,7 @@ import com.vaadin.ui.VerticalLayout; public abstract class AbstractTestUI extends UI { @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { getPage().setTitle(getClass().getName()); Label label = new Label(getTestDescription(), ContentMode.HTML); @@ -32,7 +32,7 @@ public abstract class AbstractTestUI extends UI { return layout; } - protected abstract void setup(WrappedRequest request); + protected abstract void setup(VaadinRequest request); @Override public void addComponent(Component c) { diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java index 197408a533..45f34222e6 100644 --- a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java +++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.AbstractComponent; public class UnknownComponentConnectorTest extends AbstractTestUI { @@ -26,7 +26,7 @@ public class UnknownComponentConnectorTest extends AbstractTestUI { } @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new ComponentWithoutConnector()); } diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java index d318afc34f..75707a7d79 100644 --- a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.abstractcomponent; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.VaadinClasses; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; @@ -25,7 +25,7 @@ import com.vaadin.ui.GridLayout; public class AllComponentTooltipTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { setContent(new GridLayout(5, 5)); for (Class<? extends Component> cls : VaadinClasses.getComponents()) { try { diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java index dc3cffffb6..c6f6e1b770 100644 --- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java +++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.formlayout; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.ui.PopupDateField; @@ -23,7 +23,7 @@ import com.vaadin.ui.PopupDateField; public class FormLayoutErrorHover extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { FormLayout formLayout = new FormLayout(); PopupDateField fromDate = new PopupDateField("Date"); fromDate.setImmediate(true); diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index bc17447052..aef1ef83d0 100644 --- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -26,7 +26,7 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.server.DynamicConnectorResource; import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.URLReference; @@ -122,7 +122,7 @@ public class BasicJavaScriptComponent extends AbstractTestUI { private final Log log = new Log(5); @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(log); ExampleWidget c = new ExampleWidget(); diff --git a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java index c3d0d9cccd..8914daf390 100644 --- a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java +++ b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.label;
import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
@@ -12,7 +12,7 @@ public class LabelPropertySourceValue extends AbstractTestUI { private Label label;
@Override
- public void setup(WrappedRequest request) {
+ public void setup(VaadinRequest request) {
label = new Label("Hello Vaadin user");
addComponent(label);
Button button = new Button("Give label a new property data source...");
diff --git a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java index 12fbc36fbb..f503e8966f 100644 --- a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.label; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractLayout; @@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout; public class MarginsInLabels extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { AbstractLayout layout = new VerticalLayout(); layout.addComponent(new Label("<h1>Vertical layout</h1>", ContentMode.HTML)); diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index 3227676e11..1ffa1cad88 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -11,7 +11,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; @@ -52,7 +52,7 @@ public class BoxLayoutTest extends AbstractTestUI { protected CheckBox expand; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { view = new VerticalLayout(); view.setMargin(true); diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index 125dfae37a..9d7d88cce7 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -8,7 +8,7 @@ import java.util.List; import com.vaadin.annotations.Theme; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractOrderedLayout; @@ -117,7 +117,7 @@ public class OrderedLayoutCases extends AbstractTestUI { private HorizontalLayout sizeBar; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { TestUtils .injectCSS( getUI(), diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java index a14f37f95e..82fc8933a0 100644 --- a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.annotations.Theme; import com.vaadin.server.Sizeable; import com.vaadin.server.ThemeResource; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.slider.SliderOrientation; import com.vaadin.tests.components.AbstractTestUI; @@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout; public class VaadinTunesLayout extends AbstractTestUI { @Override - public void setup(WrappedRequest request) { + public void setup(VaadinRequest request) { /* * We'll build the whole UI here, since the application will not contain diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java index fd96b08cfb..a49fa34af0 100644 --- a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.panel; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -39,7 +39,7 @@ public class PanelChangeContents extends AbstractTestUI implements private Panel panel; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { VerticalLayout content = new VerticalLayout(); setSizeFull(); HorizontalLayout buttons = new HorizontalLayout(); diff --git a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java index d755f5961e..8447b7689e 100644 --- a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.popupview; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; @@ -26,7 +26,7 @@ public class ReopenPopupView extends AbstractTestUI { private final Log log = new Log(5); @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(log); addComponent(new PopupView("PopupView", new Button("Button", new Button.ClickListener() { diff --git a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java index 63ff00034f..a9cecfd6b5 100644 --- a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import java.net.MalformedURLException; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbsoluteLayout; @@ -17,7 +17,7 @@ import com.vaadin.ui.themes.Reindeer; public class TableInTabsheet extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { getUI().setCaption("test"); VerticalLayout vPrinc = new VerticalLayout(); vPrinc.setStyleName(Reindeer.LAYOUT_BLUE); diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java index f8f7a16c4d..d405a4c138 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUIProvider; import com.vaadin.ui.Label; @@ -14,28 +14,28 @@ public class LazyInitUIs extends AbstractTestUIProvider { // @EagerInit private static class EagerInitUI extends UI { @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { addComponent(getRequestInfo("EagerInitUI", request)); } } @Override - public UI createInstance(WrappedRequest request, + public UI createInstance(VaadinRequest request, Class<? extends UI> type) { return getUI(request); } @Override - public Class<? extends UI> getUIClass(WrappedRequest request) { + public Class<? extends UI> getUIClass(VaadinRequest request) { return getUI(request).getClass(); } - private UI getUI(WrappedRequest request) { + private UI getUI(VaadinRequest request) { if (request.getParameter("lazyCreate") != null) { // UI created on second request UI uI = new UI() { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { addComponent(getRequestInfo("LazyCreateUI", request)); } }; @@ -47,7 +47,7 @@ public class LazyInitUIs extends AbstractTestUIProvider { // The standard UI UI uI = new UI() { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { addComponent(getRequestInfo("NormalUI", request)); Link lazyCreateLink = new Link("Open lazyCreate UI", @@ -68,7 +68,7 @@ public class LazyInitUIs extends AbstractTestUIProvider { } } - public static Label getRequestInfo(String name, WrappedRequest request) { + public static Label getRequestInfo(String name, VaadinRequest request) { String info = name; info += "<br />pathInfo: " + request.getRequestPathInfo(); info += "<br />parameters: " + request.getParameterMap().keySet(); diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java index ec0cdf53a2..1a5db630b3 100644 --- a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java +++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Theme; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.Label; public class TestUITheme extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Label label = new Label("A red label"); label.setStyleName("red"); addComponent(label); diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java index 99c3c49f72..e837321b56 100644 --- a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java +++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @@ -9,7 +9,7 @@ import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; public class TestUIWidgetset extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new MissingFromDefaultWidgetsetComponent()); } diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java index b9cdb7a3dc..a68cd91a5e 100644 --- a/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java +++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.ui; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; public class TestUIWidgetset2 extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new MissingFromDefaultWidgetsetComponent()); } diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java index e225ae73d8..d5f26ade29 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.ui; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; public class UIInitException extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { throw new RuntimeException("Catch me if you can"); } diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java index 68e6a4da34..8aa2032935 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java @@ -4,14 +4,14 @@ package com.vaadin.tests.components.ui; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; public class UIInitTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new Label("Hello UI")); } diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java index 2d27989dd4..c5d997cfd4 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIProvider; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -15,7 +15,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider { public static class TabUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { VaadinSession application = VaadinSession.getCurrent(); AtomicInteger count = numberOfUIsOpened.get(application); if (count == null) { @@ -32,7 +32,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider { } @Override - public Class<? extends UI> getUIClass(WrappedRequest request) { + public Class<? extends UI> getUIClass(VaadinRequest request) { return TabUI.class; } diff --git a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java index 591a045e1d..b1cfffd410 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java +++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.Page; import com.vaadin.server.Page.FragmentChangedEvent; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -13,7 +13,7 @@ public class UriFragmentTest extends AbstractTestUI { private final Label fragmentLabel = new Label(); @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(fragmentLabel); updateLabel(); getPage().addListener(new Page.FragmentChangedListener() { diff --git a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java index 673045af89..b9e1529fef 100644 --- a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java +++ b/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.uitest; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -15,7 +15,7 @@ public class ThemeTestUI extends AbstractTestUI { private String customStyleName = null; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { getLayout().setSpacing(true); createCustomStyleStringField(); diff --git a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index 4d0dea4f91..33eb310822 100644 --- a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.window; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.server.VaadinService; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; @@ -23,7 +23,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase { @Override public void init() { - WrappedRequest request = VaadinService.getCurrentRequest(); + VaadinRequest request = VaadinService.getCurrentRequest(); if (request.getParameter("attachMainFirst") != null) { addSubWindowBeforeMainWindow = false; } else { diff --git a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java index 847ee585f7..5a0e4d1370 100644 --- a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java +++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.window; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -14,7 +14,7 @@ public class RepaintWindowContents extends AbstractTestUI { @SuppressWarnings("serial") @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final Window window = new Window("Test window"); addWindow(window); diff --git a/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java index 7d4efe39ce..12af6ccdae 100644 --- a/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java +++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -24,7 +24,7 @@ import com.vaadin.ui.Window; public class TooltipInWindow extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Window window = new Window("Window"); window.getContent().setSizeUndefined(); window.center(); diff --git a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java index 40856af11e..ca53427e91 100644 --- a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java +++ b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -28,7 +28,7 @@ import com.vaadin.ui.Label; public class BasicExtensionTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Label label = new Label(); addComponent(label); diff --git a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index 576b16fbb6..f4b95f3391 100644 --- a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -16,7 +16,7 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -25,7 +25,7 @@ import com.vaadin.ui.Button.ClickEvent; public class HelloWorldExtensionTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final HelloWorldExtension extension = new HelloWorldExtension(); extension.setGreeting("Kind words"); addExtension(extension); diff --git a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java index 9999925bb0..47d5f8648b 100644 --- a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -20,7 +20,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.JavaScript; @@ -31,7 +31,7 @@ public class JavascriptManagerTest extends AbstractTestUI { private Log log = new Log(5); @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(log); final JavaScript js = JavaScript.getCurrent(); js.addFunction("testing.doTest", new JavaScriptFunction() { diff --git a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index ee78a1a6a0..19c289484a 100644 --- a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -22,7 +22,7 @@ import org.json.JSONException; import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; import com.vaadin.server.AbstractJavaScriptExtension; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; @@ -98,7 +98,7 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI { } @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final SimpleJavascriptExtension simpleJavascriptExtension = new SimpleJavascriptExtension(); simpleJavascriptExtension.setPrefix("Prefix: "); addExtension(simpleJavascriptExtension); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 4e8d2f3160..4111f6c07a 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.util.BeanItem; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; /** @@ -33,7 +33,7 @@ import com.vaadin.ui.UI; public class AutoGeneratingForm extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { FieldGroup fieldGroup = new BeanFieldGroup<Person>(Person.class); // We need an item data source before we create the fields to be able to diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java index f55377b3f4..b099b7d466 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; public class BasicApplication extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { VerticalLayout view = new VerticalLayout(); view.addComponent(new Label("Hello Vaadin!")); setContent(view); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index cfb24c732f..ffe1f09216 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.annotations.PreserveOnRefresh; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; @@ -34,7 +34,7 @@ public class CreatingPreserveState extends UI { private static int windowCounter = 0; @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { TextField tf = new TextField("Window #" + (++windowCounter)); tf.setImmediate(true); getContent().addComponent(tf); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java index ff2263e208..8438135c60 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java @@ -1,12 +1,12 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.TextField; public class CustomConverterFactoryUI extends AbstractTestUI { @Override - public void setup(WrappedRequest request) { + public void setup(VaadinRequest request) { getSession().setConverterFactory(new MyConverterFactory()); TextField tf = new TextField("This is my double field"); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java index 9da6a75a45..a06a41602a 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.annotations.Theme; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; @@ -33,7 +33,7 @@ import com.vaadin.ui.VerticalLayout; public class DefineUITheme extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { VerticalLayout view = new VerticalLayout(); view.addComponent(new Label("Hello Vaadin")); setContent(view); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 821660e9e6..d6d2aa2440 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.AbstractUIProvider; import com.vaadin.server.WebBrowser; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -33,7 +33,7 @@ import com.vaadin.ui.UI; public class DifferentFeaturesForDifferentClients extends AbstractUIProvider { @Override - public Class<? extends UI> getUIClass(WrappedRequest request) { + public Class<? extends UI> getUIClass(VaadinRequest request) { // could also use browser version etc. if (request.getHeader("user-agent").contains("mobile")) { return TouchRoot.class; @@ -45,7 +45,7 @@ public class DifferentFeaturesForDifferentClients extends AbstractUIProvider { // Must override as default implementation isn't allowed to // instantiate our non-public classes @Override - public UI createInstance(WrappedRequest request, + public UI createInstance(VaadinRequest request, Class<? extends UI> type) { try { return type.newInstance(); @@ -57,7 +57,7 @@ public class DifferentFeaturesForDifferentClients extends AbstractUIProvider { class DefaultRoot extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { getContent().addComponent( new Label("This browser does not support touch events")); } @@ -65,7 +65,7 @@ class DefaultRoot extends UI { class TouchRoot extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { WebBrowser webBrowser = request.getBrowserDetails().getWebBrowser(); String screenSize = "" + webBrowser.getScreenWidth() + "x" + webBrowser.getScreenHeight(); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java index e17d7c2a34..8ab2796da4 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java @@ -10,15 +10,15 @@ import javax.imageio.ImageIO; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Embedded; public class DynamicImageUI extends AbstractTestUI { @Override - public void setup(WrappedRequest request) { + public void setup(VaadinRequest request) { // Add the request handler that handles our dynamic image getSession().addRequestHandler(new DynamicImageRequestHandler()); @@ -57,7 +57,7 @@ class DynamicImageRequestHandler implements RequestHandler { @Override public boolean handleRequest(VaadinSession session, - WrappedRequest request, WrappedResponse response) + VaadinRequest request, VaadinResponse response) throws IOException { String pathInfo = request.getRequestPathInfo(); if (("/" + IMAGE_URL).equals(pathInfo)) { diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java index ef0346b293..cc1bc8c77b 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.VaadinSession; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -35,7 +35,7 @@ import com.vaadin.ui.UI; public class FindCurrentUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { Button helloButton = new Button("Say Hello"); helloButton.addListener(new ClickListener() { @Override diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java index a3de39c039..84f6ec26ff 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.PropertyId; import com.vaadin.data.util.BeanItem; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.TextArea; @@ -73,7 +73,7 @@ public class FormUsingExistingLayout extends AbstractTestUI { } @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { // Create the layout MyFormLayout myFormLayout = new MyFormLayout(); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java index ae8de83e30..be2768a5f7 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java @@ -4,7 +4,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.util.converter.StringToNumberConverter; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Table; @@ -15,7 +15,7 @@ public class FormatTableValue extends AbstractTestUI { private static final String DEFAULT_PROPERTY = "default"; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Table table = new Table(); table.setLocale(Locale.FRANCE); table.addContainerProperty(PERCENT_PROPERTY, Double.class, 0); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index f0df14e158..8c38cf03b0 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -26,7 +26,7 @@ public class IntegerTextFieldDataSource extends AbstractTestUI { } @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final MyBean myBean = new MyBean(); BeanItem<MyBean> beanItem = new BeanItem<MyBean>(myBean); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 1e32916d0b..fd43115732 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.util.converter.Converter.ConversionException; import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -14,7 +14,7 @@ import com.vaadin.ui.TextField; public class IntegerTextFieldStandalone extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final TextField textField = new TextField("Text field"); textField.setConverter(new StringToIntegerConverter()); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index 2c7d6ee7ba..3ddfaa606d 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.ExternalResource; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.UI; @@ -50,7 +50,7 @@ public class MultiTabApplication extends UI { } @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { String person = request.getParameter("editPerson"); if (person == null) { setContent(new MainView()); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 5834f320af..9ec7a82580 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -4,7 +4,7 @@ import java.util.Locale; import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.Converter.ConversionException; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -15,7 +15,7 @@ import com.vaadin.ui.TextField; public class StringMyTypeConverter extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Name name = new Name("Rudolph", "Reindeer"); final TextField textField = new TextField("Name"); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java index ea74baf111..51c7cbbe60 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java @@ -22,7 +22,7 @@ import javax.validation.constraints.Size; import com.vaadin.data.util.BeanItem; import com.vaadin.data.validator.BeanValidator; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; @@ -70,7 +70,7 @@ public class UsingBeanValidation extends UI { } @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { Person person = new Person("John", 26); BeanItem<Person> item = new BeanItem<Person>(person); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index 19b97078d3..9d494f7858 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.Page.FragmentChangedEvent; import com.vaadin.server.Page.FragmentChangedListener; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.UI; public class UsingUriFragments extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { Label label = new Label("Hello, your fragment is " + request.getBrowserDetails().getUriFragment()); getContent().addComponent(label); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index dc6c8ce7bf..52499ffbe5 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -31,7 +31,7 @@ import com.vaadin.ui.UI; public class UsingXyzWhenInitializing extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { String name = request.getParameter("name"); if (name == null) { name = "Unknown"; diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java index 8ad3b037b3..da178167ed 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java @@ -1,7 +1,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -16,7 +16,7 @@ import com.vaadin.ui.UI; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") public class ComponentInStateUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { ComponentInStateComponent component = new ComponentInStateComponent(); component.setOtherComponent(this); addComponent(component); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java index 62088f304d..caf38077bf 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; /** @@ -36,7 +36,7 @@ import com.vaadin.ui.UI; public class MyComponentUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { MyComponent component = new MyComponent(); component.setText("My component text"); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java index 35062fbf0c..2a64792646 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; import com.vaadin.server.ThemeResource; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; /** @@ -33,7 +33,7 @@ import com.vaadin.ui.UI; public class ResourceInStateUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { ResourceInStateComponent component = new ResourceInStateComponent(); component.setIcon(new ThemeResource("../runo/icons/32/calendar.png")); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java index 76e332504c..f7cf6b4270 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a2; import java.util.Random; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -15,7 +15,7 @@ import com.vaadin.ui.UI; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") public class WidgetcontainerUI extends UI { @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { Label label = new Label("Hello Vaadin user"); addComponent(label); final WidgetContainer widgetContainer = new WidgetContainer(); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java index 95055cd207..980d0b90b2 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; @@ -24,7 +24,7 @@ import com.vaadin.ui.UI; public class AnalyticsUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { final Analytics analytics = new Analytics("UA-33036133-12"); analytics.extend(this); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java index c82bc91088..45ac7a94a3 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.PasswordField; @@ -26,7 +26,7 @@ import com.vaadin.ui.PasswordField; public class CapsLockWarningUI extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { PasswordField field = new PasswordField("Enter your password"); new CapsLockWarning().extend(field); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java index b84cb5e599..792be69410 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java @@ -16,13 +16,13 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; public class ComplexTypesUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { ComplexTypesComponent complexTypesComponent = new ComplexTypesComponent(); complexTypesComponent.sendComplexTypes(); addComponent(complexTypesComponent); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java index 5e519d1b7a..a3ed5fe11e 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; @@ -24,7 +24,7 @@ import com.vaadin.ui.UI; public class FlotJavaScriptUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { final Flot flot = new Flot(); flot.setHeight("300px"); flot.setWidth("400px"); diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java index 793ba3dee8..18b4b1430e 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java @@ -16,12 +16,12 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; public class RedButtonUI extends UI { @Override - protected void init(WrappedRequest request) { + protected void init(VaadinRequest request) { addComponent(new RedButton("My red button")); } }
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java b/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java index 4ab3bc1526..56deebe95a 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7b1; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.PasswordField; @@ -25,7 +25,7 @@ import com.vaadin.ui.PasswordField; @Widgetset(TestingWidgetSet.NAME) public class ReducingRoundTrips extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { PasswordField passwordField = new PasswordField("Enter password"); passwordField.setImmediate(true); CapsLockWarningWithRpc capsLockWarningWithRpc = new CapsLockWarningWithRpc(); diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java b/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java index a3f7ce9f5b..146b4df02f 100644 --- a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java +++ b/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java @@ -8,7 +8,7 @@ import com.vaadin.navigator.Navigator; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Label; @@ -111,7 +111,7 @@ public class NavigatorTest extends UI { } @Override - protected void init(WrappedRequest req) { + protected void init(VaadinRequest req) { try { navi = new Navigator(this, naviLayout); diff --git a/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java index 4da3bcef2c..580188fd9b 100644 --- a/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java +++ b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java @@ -7,8 +7,8 @@ import java.util.HashMap; import javax.imageio.ImageIO; import com.vaadin.server.DynamicConnectorResource; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Embedded; @@ -17,7 +17,7 @@ public class ConnectorResourceTest extends AbstractTestUI { private static final String DYNAMIC_IMAGE_NAME = "requestImage.png"; @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new Embedded(DYNAMIC_IMAGE_NAME, new DynamicConnectorResource(this, DYNAMIC_IMAGE_NAME))); addComponent(new Embedded("Dynamic text", new DynamicConnectorResource( @@ -40,8 +40,8 @@ public class ConnectorResourceTest extends AbstractTestUI { } @Override - public boolean handleConnectorRequest(WrappedRequest request, - WrappedResponse response, String path) throws IOException { + public boolean handleConnectorRequest(VaadinRequest request, + VaadinResponse response, String path) throws IOException { if (DYNAMIC_IMAGE_NAME.equals(path)) { // Create an image, draw the "text" parameter to it and output it to // the browser. diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java index 3a5dd0a326..7d5f0b8da8 100644 --- a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java +++ b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent; @@ -25,7 +25,7 @@ import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent; @Widgetset(TestingWidgetSet.NAME) public class DelegateToWidgetTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new DelegateToWidgetComponent()); } diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java b/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java index 29975dda91..5a4bc47b61 100644 --- a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java +++ b/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DelegateWithoutStateClassComponent; @@ -26,7 +26,7 @@ import com.vaadin.tests.widgetset.server.DelegateWithoutStateClassComponent; public class DelegateWithoutStateClassTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { DelegateWithoutStateClassComponent c = new DelegateWithoutStateClassComponent(); c.setRows(10); addComponent(c); diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java index 0d939a3d18..5932976935 100644 --- a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java +++ b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DummyLabel; @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; public class SerializerNamespaceTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { addComponent(new Label("The real label")); addComponent(new DummyLabel("The dummy label")); } diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java index a614b99b20..e7acd3e79b 100644 --- a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java @@ -27,7 +27,7 @@ import java.util.Map.Entry; import java.util.Set; import com.vaadin.annotations.Widgetset; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; @@ -43,7 +43,7 @@ public class SerializerTest extends AbstractTestUI { private Log log = new Log(40); @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { final SerializerTestExtension testExtension = new SerializerTestExtension(); addExtension(testExtension); addComponent(log); diff --git a/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java b/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java index 6640134326..c1324a0751 100644 --- a/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java +++ b/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.themes; import com.vaadin.annotations.Theme; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -11,7 +11,7 @@ import com.vaadin.ui.themes.LiferayTheme; public class LiferayThemeTest extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { Panel p = new Panel("Panel"); addComponent(p); p.addComponent(new Label("Panel content")); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java index 4c6073c7ed..2facf44268 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java @@ -15,8 +15,8 @@ import com.vaadin.server.DownloadStream; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; @@ -53,7 +53,7 @@ class MyDynamicResource implements RequestHandler { */ @Override public boolean handleRequest(VaadinSession session, - WrappedRequest request, WrappedResponse response) + VaadinRequest request, VaadinResponse response) throws IOException { String relativeUri = request.getRequestPathInfo(); // Catch the given URI that identifies the resource, otherwise let other diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java index d2aa19e47d..f18406ede3 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java @@ -6,8 +6,8 @@ import java.util.Map; import com.vaadin.LegacyApplication; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -95,7 +95,7 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler { @Override public boolean handleRequest(VaadinSession session, - WrappedRequest request, WrappedResponse response) + VaadinRequest request, VaadinResponse response) throws IOException { Map<String, String[]> parameters = request.getParameterMap(); String[] s = parameters.get("state"); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java index 8fd1c7f883..e67e83b501 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java @@ -13,8 +13,8 @@ import com.vaadin.server.DownloadStream; import com.vaadin.server.ExternalResource; import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinSession; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinResponse; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; @@ -49,7 +49,7 @@ public class Ticket2292 extends com.vaadin.LegacyApplication implements @Override public boolean handleRequest(VaadinSession session, - WrappedRequest request, WrappedResponse response) + VaadinRequest request, VaadinResponse response) throws IOException { String relativeUri = request.getRequestPathInfo(); diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket8291.java b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java index 820502afa1..8667475f14 100644 --- a/uitest/src/com/vaadin/tests/tickets/Ticket8291.java +++ b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java @@ -7,7 +7,7 @@ import java.util.List; import com.vaadin.data.Container.Filter; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -21,7 +21,7 @@ import com.vaadin.ui.UI; public class Ticket8291 extends UI { @Override - public void init(WrappedRequest request) { + public void init(VaadinRequest request) { setContent(new TestView()); } diff --git a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java index bc3d88e2bb..35f7aeb044 100644 --- a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java +++ b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java @@ -16,13 +16,13 @@ package com.vaadin.tests.vaadincontext; -import com.vaadin.server.WrappedRequest; +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; public class BootstrapModifyUI extends AbstractTestUI { @Override - protected void setup(WrappedRequest request) { + protected void setup(VaadinRequest request) { // TODO Auto-generated method stub } |