From 427ca95413bd3d30934d85fe7850fa918db44697 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 8 Nov 2011 14:39:56 +0200
Subject: [PATCH] Extract WrappedHttpServletResponse to a separate class

---
 .../gwt/server/CommunicationManager.java      | 51 ++-----------------
 .../server/WrappedHttpServletResponse.java    | 48 +++++++++++++++++
 2 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java

diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index fd97f9e0ea..c7eb62e8f2 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -6,8 +6,6 @@ package com.vaadin.terminal.gwt.server;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -41,45 +39,6 @@ import com.vaadin.ui.Root;
 @SuppressWarnings("serial")
 public class CommunicationManager extends AbstractCommunicationManager {
 
-    /**
-     * Concrete wrapper class for {@link HttpServletResponse}.
-     * 
-     * @see Response
-     */
-    private static class HttpServletResponseWrapper implements WrappedResponse {
-
-        private final HttpServletResponse response;
-
-        public HttpServletResponseWrapper(HttpServletResponse response) {
-            this.response = response;
-        }
-
-        public OutputStream getOutputStream() throws IOException {
-            return response.getOutputStream();
-        }
-
-        public HttpServletResponse getHttpServletResponse() {
-            return response;
-        }
-
-        public void setContentType(String type) {
-            response.setContentType(type);
-        }
-
-        public PrintWriter getWriter() throws IOException {
-            return response.getWriter();
-        }
-
-        public void setStatus(int responseStatus) {
-            response.setStatus(responseStatus);
-        }
-
-        public void setHeader(String name, String value) {
-            response.setHeader(name, value);
-        }
-
-    }
-
     private static class AbstractApplicationServletWrapper implements Callback {
 
         private final AbstractApplicationServlet servlet;
@@ -94,7 +53,7 @@ public class CommunicationManager extends AbstractCommunicationManager {
                 String details, String outOfSyncURL) throws IOException {
             servlet.criticalNotification(((WrappedHttpServletRequest) request)
                     .getHttpServletRequest(),
-                    ((HttpServletResponseWrapper) response)
+                    ((WrappedHttpServletResponse) response)
                             .getHttpServletResponse(), cap, msg, details,
                     outOfSyncURL);
         }
@@ -174,14 +133,14 @@ public class CommunicationManager extends AbstractCommunicationManager {
                 // Multipart requests contain boundary string
                 doHandleSimpleMultipartFileUpload(
                         new WrappedHttpServletRequest(request, servlet),
-                        new HttpServletResponseWrapper(response),
+                        new WrappedHttpServletResponse(response),
                         streamVariable, variableName, source,
                         contentType.split("boundary=")[1]);
             } else {
                 // if boundary string does not exist, the posted file is from
                 // XHR2.post(File)
                 doHandleXhrFilePost(new WrappedHttpServletRequest(request,
-                        servlet), new HttpServletResponseWrapper(response),
+                        servlet), new WrappedHttpServletResponse(response),
                         streamVariable, variableName, source,
                         request.getContentLength());
             }
@@ -212,7 +171,7 @@ public class CommunicationManager extends AbstractCommunicationManager {
             throws IOException, ServletException,
             InvalidUIDLSecurityKeyException {
         doHandleUidlRequest(new WrappedHttpServletRequest(request,
-                applicationServlet), new HttpServletResponseWrapper(response),
+                applicationServlet), new WrappedHttpServletResponse(response),
                 new AbstractApplicationServletWrapper(applicationServlet), root);
     }
 
@@ -317,7 +276,7 @@ public class CommunicationManager extends AbstractCommunicationManager {
             HttpServletResponse response, AbstractApplicationServlet servlet)
             throws IOException {
         return handleApplicationRequest(new WrappedHttpServletRequest(request,
-                servlet), new HttpServletResponseWrapper(response));
+                servlet), new WrappedHttpServletResponse(response));
     }
 
 }
diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
new file mode 100644
index 0000000000..53a7f87707
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
@@ -0,0 +1,48 @@
+package com.vaadin.terminal.gwt.server;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.vaadin.terminal.WrappedResponse;
+
+/**
+ * Concrete wrapper class for {@link HttpServletResponse}.
+ * 
+ * @see Response
+ */
+public class WrappedHttpServletResponse implements WrappedResponse {
+
+    private final HttpServletResponse response;
+
+    public WrappedHttpServletResponse(HttpServletResponse response) {
+        this.response = response;
+    }
+
+    public OutputStream getOutputStream() throws IOException {
+        return response.getOutputStream();
+    }
+
+    public HttpServletResponse getHttpServletResponse() {
+        return response;
+    }
+
+    public void setContentType(String type) {
+        response.setContentType(type);
+    }
+
+    public PrintWriter getWriter() throws IOException {
+        return response.getWriter();
+    }
+
+    public void setStatus(int responseStatus) {
+        response.setStatus(responseStatus);
+    }
+
+    public void setHeader(String name, String value) {
+        response.setHeader(name, value);
+    }
+
+}
\ No newline at end of file
-- 
2.39.5