Minor refactoring: split out common nested class RestrictedRenderResponse from Portle...

svn changeset:10022/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
index 621ef1b2460be3cf132a6067601488425d7b71b3..0e3289dea660d3c31da0865b65d6b810ca2acbfb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
@@ -3,34 +3,21 @@
  */\r
 package com.vaadin.terminal.gwt.server;\r
 \r
-import java.io.IOException;\r
-import java.io.OutputStream;\r
-import java.io.PrintWriter;\r
 import java.io.Serializable;\r
-import java.util.Collection;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.LinkedHashSet;\r
-import java.util.Locale;\r
 import java.util.Map;\r
 import java.util.Set;\r
 \r
 import javax.portlet.ActionRequest;\r
 import javax.portlet.ActionResponse;\r
-import javax.portlet.CacheControl;\r
 import javax.portlet.Portlet;\r
-import javax.portlet.PortletMode;\r
 import javax.portlet.PortletSession;\r
-import javax.portlet.PortletURL;\r
 import javax.portlet.RenderRequest;\r
 import javax.portlet.RenderResponse;\r
-import javax.portlet.ResourceURL;\r
-import javax.servlet.http.Cookie;\r
 import javax.servlet.http.HttpSession;\r
 \r
-import org.w3c.dom.DOMException;\r
-import org.w3c.dom.Element;\r
-\r
 import com.vaadin.Application;\r
 \r
 /**\r
@@ -186,127 +173,4 @@ public class PortletApplicationContext extends WebApplicationContext implements
                 ActionResponse response);\r
     }\r
 \r
-    private class RestrictedRenderResponse implements RenderResponse,\r
-            Serializable {\r
-\r
-        private RenderResponse response;\r
-\r
-        private RestrictedRenderResponse(RenderResponse response) {\r
-            this.response = response;\r
-        }\r
-\r
-        public void addProperty(String key, String value) {\r
-            response.addProperty(key, value);\r
-        }\r
-\r
-        public PortletURL createActionURL() {\r
-            return response.createActionURL();\r
-        }\r
-\r
-        public PortletURL createRenderURL() {\r
-            return response.createRenderURL();\r
-        }\r
-\r
-        public String encodeURL(String path) {\r
-            return response.encodeURL(path);\r
-        }\r
-\r
-        public void flushBuffer() throws IOException {\r
-            // NOP\r
-            // TODO throw?\r
-        }\r
-\r
-        public int getBufferSize() {\r
-            return response.getBufferSize();\r
-        }\r
-\r
-        public String getCharacterEncoding() {\r
-            return response.getCharacterEncoding();\r
-        }\r
-\r
-        public String getContentType() {\r
-            return response.getContentType();\r
-        }\r
-\r
-        public Locale getLocale() {\r
-            return response.getLocale();\r
-        }\r
-\r
-        public String getNamespace() {\r
-            return response.getNamespace();\r
-        }\r
-\r
-        public OutputStream getPortletOutputStream() throws IOException {\r
-            // write forbidden\r
-            return null;\r
-        }\r
-\r
-        public PrintWriter getWriter() throws IOException {\r
-            // write forbidden\r
-            return null;\r
-        }\r
-\r
-        public boolean isCommitted() {\r
-            return response.isCommitted();\r
-        }\r
-\r
-        public void reset() {\r
-            // NOP\r
-            // TODO throw?\r
-        }\r
-\r
-        public void resetBuffer() {\r
-            // NOP\r
-            // TODO throw?\r
-        }\r
-\r
-        public void setBufferSize(int size) {\r
-            // NOP\r
-            // TODO throw?\r
-        }\r
-\r
-        public void setContentType(String type) {\r
-            // NOP\r
-            // TODO throw?\r
-        }\r
-\r
-        public void setProperty(String key, String value) {\r
-            response.setProperty(key, value);\r
-        }\r
-\r
-        public void setTitle(String title) {\r
-            response.setTitle(title);\r
-        }\r
-\r
-               public void setNextPossiblePortletModes(\r
-                               Collection<PortletMode> portletModes) {\r
-                       // NOP\r
-                       // TODO throw?\r
-               }\r
-\r
-               public ResourceURL createResourceURL() {\r
-                       return response.createResourceURL();\r
-               }\r
-\r
-               public CacheControl getCacheControl() {\r
-                       return response.getCacheControl();\r
-               }\r
-\r
-               public void addProperty(Cookie cookie) {\r
-                       // NOP\r
-                       // TODO throw?                  \r
-               }\r
-\r
-               public void addProperty(String key, Element element) {\r
-                       // NOP\r
-                       // TODO throw?                  \r
-               }\r
-\r
-               public Element createElement(String tagName) throws DOMException {\r
-                       // NOP\r
-                       return null;\r
-               }\r
-\r
-    }\r
-\r
 }\r

diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index 84b85d866a3f5ee297b8b40b25e8814ff23fc3f7..a8814b4c88890466d47a844a9c989601404833ac 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -1,8 +1,6 @@
 package com.vaadin.terminal.gwt.server;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.StringWriter;
@@ -13,30 +11,22 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
-import javax.portlet.CacheControl;
 import javax.portlet.EventRequest;
 import javax.portlet.EventResponse;
-import javax.portlet.PortletMode;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
-import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceURL;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
 
 import com.vaadin.Application;
 import com.vaadin.service.ApplicationContext;
@@ -281,126 +271,4 @@ public class PortletApplicationContext2 implements ApplicationContext,
                 ResourceResponse response);
     }
 
-    private class RestrictedRenderResponse implements RenderResponse,
-            Serializable {
-
-        private RenderResponse response;
-
-        private RestrictedRenderResponse(RenderResponse response) {
-            this.response = response;
-        }
-
-        public void addProperty(String key, String value) {
-            response.addProperty(key, value);
-        }
-
-        public PortletURL createActionURL() {
-            return response.createActionURL();
-        }
-
-        public PortletURL createRenderURL() {
-            return response.createRenderURL();
-        }
-
-        public String encodeURL(String path) {
-            return response.encodeURL(path);
-        }
-
-        public void flushBuffer() throws IOException {
-            // NOP
-            // TODO throw?
-        }
-
-        public int getBufferSize() {
-            return response.getBufferSize();
-        }
-
-        public String getCharacterEncoding() {
-            return response.getCharacterEncoding();
-        }
-
-        public String getContentType() {
-            return response.getContentType();
-        }
-
-        public Locale getLocale() {
-            return response.getLocale();
-        }
-
-        public String getNamespace() {
-            return response.getNamespace();
-        }
-
-        public OutputStream getPortletOutputStream() throws IOException {
-            // write forbidden
-            return null;
-        }
-
-        public PrintWriter getWriter() throws IOException {
-            // write forbidden
-            return null;
-        }
-
-        public boolean isCommitted() {
-            return response.isCommitted();
-        }
-
-        public void reset() {
-            // NOP
-            // TODO throw?
-        }
-
-        public void resetBuffer() {
-            // NOP
-            // TODO throw?
-        }
-
-        public void setBufferSize(int size) {
-            // NOP
-            // TODO throw?
-        }
-
-        public void setContentType(String type) {
-            // NOP
-            // TODO throw?
-        }
-
-        public void setProperty(String key, String value) {
-            response.setProperty(key, value);
-        }
-
-        public void setTitle(String title) {
-            response.setTitle(title);
-        }
-
-        public void setNextPossiblePortletModes(
-                Collection<PortletMode> portletModes) {
-            // NOP
-            // TODO throw?
-        }
-
-        public ResourceURL createResourceURL() {
-            return response.createResourceURL();
-        }
-
-        public CacheControl getCacheControl() {
-            return response.getCacheControl();
-        }
-
-        public void addProperty(Cookie cookie) {
-            // NOP
-            // TODO throw?
-        }
-
-        public void addProperty(String key, Element element) {
-            // NOP
-            // TODO throw?
-        }
-
-        public Element createElement(String tagName) throws DOMException {
-            // NOP
-            return null;
-        }
-    }
-
 }

diff --git a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
new file mode 100644 (file)
index 0000000..95458d5
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
@@ -0,0 +1,146 @@
+package com.vaadin.terminal.gwt.server;\r
+\r
+import java.io.IOException;\r
+import java.io.OutputStream;\r
+import java.io.PrintWriter;\r
+import java.io.Serializable;\r
+import java.util.Collection;\r
+import java.util.Locale;\r
+\r
+import javax.portlet.CacheControl;\r
+import javax.portlet.PortletMode;\r
+import javax.portlet.PortletURL;\r
+import javax.portlet.RenderResponse;\r
+import javax.portlet.ResourceURL;\r
+import javax.servlet.http.Cookie;\r
+\r
+import org.w3c.dom.DOMException;\r
+import org.w3c.dom.Element;\r
+\r
+/**\r
+ * Read-only wrapper for a {@link RenderResponse}.\r
+ *\r
+ * Only for use by {@link PortletApplicationContext} and\r
+ * {@link PortletApplicationContext2}.\r
+ */\r
+class RestrictedRenderResponse implements RenderResponse,\r
+        Serializable {\r
+\r
+    private RenderResponse response;\r
+\r
+    RestrictedRenderResponse(RenderResponse response) {\r
+        this.response = response;\r
+    }\r
+\r
+    public void addProperty(String key, String value) {\r
+        response.addProperty(key, value);\r
+    }\r
+\r
+    public PortletURL createActionURL() {\r
+        return response.createActionURL();\r
+    }\r
+\r
+    public PortletURL createRenderURL() {\r
+        return response.createRenderURL();\r
+    }\r
+\r
+    public String encodeURL(String path) {\r
+        return response.encodeURL(path);\r
+    }\r
+\r
+    public void flushBuffer() throws IOException {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public int getBufferSize() {\r
+        return response.getBufferSize();\r
+    }\r
+\r
+    public String getCharacterEncoding() {\r
+        return response.getCharacterEncoding();\r
+    }\r
+\r
+    public String getContentType() {\r
+        return response.getContentType();\r
+    }\r
+\r
+    public Locale getLocale() {\r
+        return response.getLocale();\r
+    }\r
+\r
+    public String getNamespace() {\r
+        return response.getNamespace();\r
+    }\r
+\r
+    public OutputStream getPortletOutputStream() throws IOException {\r
+        // write forbidden\r
+        return null;\r
+    }\r
+\r
+    public PrintWriter getWriter() throws IOException {\r
+        // write forbidden\r
+        return null;\r
+    }\r
+\r
+    public boolean isCommitted() {\r
+        return response.isCommitted();\r
+    }\r
+\r
+    public void reset() {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public void resetBuffer() {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public void setBufferSize(int size) {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public void setContentType(String type) {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public void setProperty(String key, String value) {\r
+        response.setProperty(key, value);\r
+    }\r
+\r
+    public void setTitle(String title) {\r
+        response.setTitle(title);\r
+    }\r
+\r
+    public void setNextPossiblePortletModes(\r
+            Collection<PortletMode> portletModes) {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public ResourceURL createResourceURL() {\r
+        return response.createResourceURL();\r
+    }\r
+\r
+    public CacheControl getCacheControl() {\r
+        return response.getCacheControl();\r
+    }\r
+\r
+    public void addProperty(Cookie cookie) {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public void addProperty(String key, Element element) {\r
+        // NOP\r
+        // TODO throw?\r
+    }\r
+\r
+    public Element createElement(String tagName) throws DOMException {\r
+        // NOP\r
+        return null;\r
+    }\r
+}
\ No newline at end of file