Pass WrappedRequest to Root.init and RootLayout.init

3 files changed, 8 insertions, 5 deletions

diff --git a/src/com/vaadin/RootTestApplication.java b/src/com/vaadin/RootTestApplication.java
index 983c3d48be..034169bc9d 100644
--- a/src/com/vaadin/RootTestApplication.java
+++ b/src/com/vaadin/RootTestApplication.java
@@ -27,7 +27,7 @@ public class RootTestApplication extends Application {
             this.rootText = rootText;
         }
 
-        public void init() {
+        public void init(WrappedRequest request) {
             if (rootText != null && rootText.trim().length() != 0) {
                 addComponent(new Label(rootText));
             }
@@ -109,7 +109,7 @@ public class RootTestApplication extends Application {
 
             // TODO Should be done by Application during init
             root.setApplication(this);
-            root.init();
+            root.init(request);
         }
 
         return root;
diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 4454800bb3..462473ccd7 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -12,6 +12,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.gwt.client.ui.VView;
 import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.Window.Notification;
@@ -443,7 +444,7 @@ public class Root extends AbstractComponentContainer {
         return rootLayout;
     }
 
-    public void init() {
-        getRootLayout().init();
+    public void init(WrappedRequest request) {
+        getRootLayout().init(request);
     }
 }
diff --git a/src/com/vaadin/ui/RootLayout.java b/src/com/vaadin/ui/RootLayout.java
index 8ccd9e6c08..16dd034f91 100644
--- a/src/com/vaadin/ui/RootLayout.java
+++ b/src/com/vaadin/ui/RootLayout.java
@@ -1,5 +1,7 @@
 package com.vaadin.ui;
 
+import com.vaadin.terminal.WrappedRequest;
+
 public interface RootLayout extends Component {
-    public void init();
+    public void init(WrappedRequest request);
 }