Rename WrappedXYZ -> VaadinXYZ but retain WrappedSession (#9633)

4 files changed, 8 insertions, 8 deletions

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));