Refactor to use different WrappedRequests for Portal specific hacks

Also move the code for updating WebBrowser to that class instead of the
duplicated code for Servlet and Portlet.

1 files changed, 17 insertions, 4 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
index 3970eac6ba..c6d3b06dd8 100644
--- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
+++ b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
@@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.server;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -56,10 +57,6 @@ public class WrappedHttpServletRequest implements WrappedRequest {
         return request;
     }
 
-    public boolean isRunningInPortlet() {
-        return false;
-    }
-
     public void setAttribute(String name, Object o) {
         request.setAttribute(name, o);
     }
@@ -100,4 +97,20 @@ public class WrappedHttpServletRequest implements WrappedRequest {
         // No browserDetails available for normal requests
         return null;
     }
+
+    public Locale getLocale() {
+        return request.getLocale();
+    }
+
+    public String getRemoteAddr() {
+        return request.getRemoteAddr();
+    }
+
+    public boolean isSecure() {
+        return request.isSecure();
+    }
+
+    public String getHeader(String headerName) {
+        return request.getHeader(headerName);
+    }
 }
\ No newline at end of file