Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers
In directory
james.mmbase.org:/tmp/cvs-serv23342/portlets-jforum/src/java/portlet/wrappers
Modified Files:
ServletResponseWrapper.java RenderRequestWrapper.java
ServletContextWrapper.java PortletContextWrapper.java
PortletResponseWrapper.java HttpSessionWrapper.java
RenderResponseWrapper.java PortletRequestWrapper.java
PortletRequestDispatcherWrapper.java
ServletRequestWrapper.java PortletSessionWrapper.java
RequestDispatcherWrapper.java
Log Message:
CMSC-1091 improve code of JForum.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers
See also: http://www.mmbase.org/jira/browse/CMSC-1091
Index: ServletResponseWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/ServletResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServletResponseWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ ServletResponseWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,50 +3,52 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a PortletResponse so it can be used as a ServletResponse */
+/**
+ * Class to wrap a PortletResponse so it can be used as a ServletResponse
+ */
public class ServletResponseWrapper implements ServletResponse {
protected PortletResponse response;
- public ServletResponseWrapper(PortletResponse response){
+ public ServletResponseWrapper(PortletResponse response) {
this.response = response;
}
public void flushBuffer() throws java.io.IOException {
- if (response instanceof RenderResponse){
- ((RenderResponse)response).flushBuffer();
+ if (response instanceof RenderResponse) {
+ ((RenderResponse) response).flushBuffer();
return;
}
System.out.println("ServletResponseWrapper: cannot flushBuffer
on a PortletResponse!");
}
- public int getBufferSize(){
- if (response instanceof RenderResponse){
- return ((RenderResponse)response).getBufferSize();
+ public int getBufferSize() {
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).getBufferSize();
}
System.out.println("ServletResponseWrapper: cannot
getBufferSize on a PortletResponse!");
return 0;
}
- public java.lang.String getContentType(){
- if (response instanceof RenderResponse){
- return ((RenderResponse)response).getContentType();
+ public java.lang.String getContentType() {
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).getContentType();
}
System.out.println("ServletResponseWrapper: cannot
getContentType on a PortletResponse!");
return null;
}
- public java.lang.String getCharacterEncoding(){
- if (response instanceof RenderResponse){
- return
((RenderResponse)response).getCharacterEncoding();
+ public java.lang.String getCharacterEncoding() {
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).getCharacterEncoding();
}
System.out.println("ServletResponseWrapper: cannot
getCharacterEncoding on a PortletResponse!");
return null;
}
- public java.util.Locale getLocale(){
- if (response instanceof RenderResponse){
- return ((RenderResponse)response).getLocale();
+ public java.util.Locale getLocale() {
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).getLocale();
}
System.out.println("ServletResponseWrapper: cannot getLocale on
a PortletResponse!");
return null;
@@ -58,40 +60,40 @@
}
public java.io.PrintWriter getWriter() throws java.io.IOException {
- if (response instanceof RenderResponse){
- return ((RenderResponse)response).getWriter();
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).getWriter();
}
System.out.println("ServletResponseWrapper: cannot getWriter on
a PortletResponse!");
return null;
}
- public boolean isCommitted(){
- if (response instanceof RenderResponse){
- return ((RenderResponse)response).isCommitted();
+ public boolean isCommitted() {
+ if (response instanceof RenderResponse) {
+ return ((RenderResponse) response).isCommitted();
}
System.out.println("ServletResponseWrapper: cannot isCommitted
on a PortletResponse!");
return false;
}
- public void reset(){
- if (response instanceof RenderResponse){
- ((RenderResponse)response).reset();
+ public void reset() {
+ if (response instanceof RenderResponse) {
+ ((RenderResponse) response).reset();
return;
}
System.out.println("ServletResponseWrapper: cannot reset on a
PortletResponse!");
}
- public void resetBuffer(){
- if (response instanceof RenderResponse){
- ((RenderResponse)response).resetBuffer();
+ public void resetBuffer() {
+ if (response instanceof RenderResponse) {
+ ((RenderResponse) response).resetBuffer();
return;
}
System.out.println("ServletResponseWrapper: cannot resetBuffer
on a PortletResponse!");
}
- public void setBufferSize(int size){
- if (response instanceof RenderResponse){
- ((RenderResponse)response).setBufferSize(size);
+ public void setBufferSize(int size) {
+ if (response instanceof RenderResponse) {
+ ((RenderResponse) response).setBufferSize(size);
return;
}
System.out.println("ServletResponseWrapper: cannot
setBufferSize on a PortletResponse!");
@@ -101,19 +103,19 @@
System.out.println("ServletResponseWrapper: cannot
setCharacterEncoding on a PortletResponse!");
}
- public void setContentLength(int len){
+ public void setContentLength(int len) {
System.out.println("ServletResponseWrapper: cannot
setContentLength on a PortletResponse!");
}
- public void setContentType(java.lang.String type){
- if (response instanceof RenderResponse){
- ((RenderResponse)response).setContentType(type);
+ public void setContentType(java.lang.String type) {
+ if (response instanceof RenderResponse) {
+ ((RenderResponse) response).setContentType(type);
return;
}
System.out.println("ServletResponseWrapper: cannot
setContentType on a PortletResponse!");
}
- public void setLocale(java.util.Locale loc){
+ public void setLocale(java.util.Locale loc) {
System.out.println("ServletResponseWrapper: cannot setLocale on
a PortletResponse!");
}
}
\ No newline at end of file
Index: RenderRequestWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/RenderRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RenderRequestWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ RenderRequestWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,10 +3,12 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a ServletRequest so it can be used as a RenderRequest */
+/**
+ * Class to wrap a ServletRequest so it can be used as a RenderRequest
+ */
public class RenderRequestWrapper extends PortletRequestWrapper implements
RenderRequest {
- public RenderRequestWrapper(ServletRequest request){
+ public RenderRequestWrapper(ServletRequest request) {
super(request);
}
}
\ No newline at end of file
Index: ServletContextWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/ServletContextWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServletContextWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ ServletContextWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,12 +3,14 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a PortletContext so it can be used as a ServletContext */
+/**
+ * Class to wrap a PortletContext so it can be used as a ServletContext
+ */
public class ServletContextWrapper implements ServletContext {
private PortletContext context;
- public ServletContextWrapper(PortletContext context){
+ public ServletContextWrapper(PortletContext context) {
this.context = context;
}
@@ -61,7 +63,7 @@
return new
RequestDispatcherWrapper(context.getRequestDispatcher(path));
}
- public java.net.URL getResource(java.lang.String path) throws
java.net.MalformedURLException{
+ public java.net.URL getResource(java.lang.String path) throws
java.net.MalformedURLException {
return context.getResource(path);
}
Index: PortletContextWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/PortletContextWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PortletContextWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ PortletContextWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,12 +3,14 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a ServletContext so it can be used as a PortletContext */
+/**
+ * Class to wrap a ServletContext so it can be used as a PortletContext
+ */
public class PortletContextWrapper implements PortletContext {
private ServletContext context;
- public PortletContextWrapper(ServletContext context){
+ public PortletContextWrapper(ServletContext context) {
this.context = context;
}
Index: PortletResponseWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/PortletResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PortletResponseWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ PortletResponseWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -4,12 +4,14 @@
import javax.servlet.http.*;
import javax.portlet.*;
-/** Class to wrap a ServletResponse so it can be used as a PortletResponse */
+/**
+ * Class to wrap a ServletResponse so it can be used as a PortletResponse
+ */
public class PortletResponseWrapper implements PortletResponse {
protected ServletResponse response;
- public PortletResponseWrapper(ServletResponse response){
+ public PortletResponseWrapper(ServletResponse response) {
this.response = response;
}
@@ -19,7 +21,7 @@
public java.lang.String encodeURL(java.lang.String path) {
if (response instanceof HttpServletResponse) {
- return ((HttpServletResponse)response).encodeURL(path);
+ return ((HttpServletResponse) response).encodeURL(path);
}
System.out.println("PortletResponseWrapper: cannot encodeURL
from a ServletResponse!");
return null;
Index: HttpSessionWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/HttpSessionWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- HttpSessionWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ HttpSessionWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -4,71 +4,73 @@
import javax.servlet.http.*;
import javax.portlet.*;
-/** Class to wrap a PortletSession so it can be used as a HttpSession */
+/**
+ * Class to wrap a PortletSession so it can be used as a HttpSession
+ */
public class HttpSessionWrapper implements HttpSession {
private PortletSession session;
private int SCOPE = PortletSession.APPLICATION_SCOPE;
- public HttpSessionWrapper(PortletSession session){
+ public HttpSessionWrapper(PortletSession session) {
this.session = session;
}
// scope (default APPLICATION_SCOPE) determines what scope
// getAttribute etc will use. Change here to use PORTLET_SCOPE if
necessary.
- public HttpSessionWrapper(PortletSession session, int scope){
+ public HttpSessionWrapper(PortletSession session, int scope) {
this.session = session;
this.SCOPE = scope;
}
- public java.lang.Object getAttribute(java.lang.String name){
+ public java.lang.Object getAttribute(java.lang.String name) {
return session.getAttribute(name, SCOPE);
}
- public java.util.Enumeration getAttributeNames(){
+ public java.util.Enumeration getAttributeNames() {
return session.getAttributeNames(SCOPE);
}
- public long getCreationTime(){
+ public long getCreationTime() {
return session.getCreationTime();
}
- public java.lang.String getId(){
+ public java.lang.String getId() {
return session.getId();
}
- public long getLastAccessedTime(){
+ public long getLastAccessedTime() {
return session.getLastAccessedTime();
}
- public int getMaxInactiveInterval(){
+ public int getMaxInactiveInterval() {
return session.getMaxInactiveInterval();
}
- public ServletContext getServletContext(){
+ public ServletContext getServletContext() {
return new ServletContextWrapper(session.getPortletContext());
}
- public HttpSessionContext getSessionContext(){
+ public HttpSessionContext getSessionContext() {
System.out.println("HttpSessionWrapper: cannot call
getSessionContext on a PortletSession!");
return null;
}
- public java.lang.Object getValue(java.lang.String name){
+ public java.lang.Object getValue(java.lang.String name) {
System.out.println("HttpSessionWrapper: cannot call getValue on
a PortletSession!");
return null;
}
- public java.lang.String[] getValueNames(){
+ public java.lang.String[] getValueNames() {
System.out.println("HttpSessionWrapper: cannot call
getValueNames on a PortletSession!");
return null;
}
- public void invalidate(){
+ public void invalidate() {
session.invalidate();
}
- public boolean isNew(){
+ public boolean isNew() {
return session.isNew();
}
@@ -76,7 +78,7 @@
System.out.println("HttpSessionWrapper: cannot call putValue on
a PortletSession!");
}
- public void removeAttribute(java.lang.String name){
+ public void removeAttribute(java.lang.String name) {
session.removeAttribute(name, SCOPE);
}
@@ -84,11 +86,11 @@
System.out.println("HttpSessionWrapper: cannot call removeValue
on a PortletSession!");
}
- public void setAttribute(java.lang.String name, java.lang.Object value){
+ public void setAttribute(java.lang.String name, java.lang.Object value) {
session.setAttribute(name, value, SCOPE);
}
- public void setMaxInactiveInterval(int interval){
+ public void setMaxInactiveInterval(int interval) {
session.setMaxInactiveInterval(interval);
}
Index: RenderResponseWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/RenderResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RenderResponseWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ RenderResponseWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,21 +3,23 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a ServletResponse so it can be used as a RenderResponse */
+/**
+ * Class to wrap a ServletResponse so it can be used as a RenderResponse
+ */
public class RenderResponseWrapper extends PortletResponseWrapper implements
RenderResponse {
public static java.lang.String EXPIRATION_CACHE =
RenderResponse.EXPIRATION_CACHE;
- public RenderResponseWrapper(ServletResponse response){
+ public RenderResponseWrapper(ServletResponse response) {
super(response);
}
- public PortletURL createActionURL(){
+ public PortletURL createActionURL() {
System.out.println("RenderResponseWrapper: cannot
createActionURL from a ServletResponse!");
return null;
}
- public PortletURL createRenderURL(){
+ public PortletURL createRenderURL() {
System.out.println("RenderResponseWrapper: cannot
createRenderURL from a ServletResponse!");
return null;
}
@@ -26,24 +28,24 @@
response.flushBuffer();
}
- public int getBufferSize(){
+ public int getBufferSize() {
return response.getBufferSize();
}
- public java.lang.String getCharacterEncoding(){
+ public java.lang.String getCharacterEncoding() {
return response.getCharacterEncoding();
}
- public java.lang.String getContentType(){
+ public java.lang.String getContentType() {
System.out.println("RenderResponseWrapper: cannot
getContentType from a ServletResponse!");
return null;
}
- public java.util.Locale getLocale(){
+ public java.util.Locale getLocale() {
return response.getLocale();
}
- public java.lang.String getNamespace(){
+ public java.lang.String getNamespace() {
System.out.println("RenderResponseWrapper: cannot getNamespace
from a ServletResponse!");
return null;
}
@@ -52,31 +54,31 @@
return response.getOutputStream();
}
- public java.io.PrintWriter getWriter() throws java.io.IOException{
+ public java.io.PrintWriter getWriter() throws java.io.IOException {
return response.getWriter();
}
- public boolean isCommitted(){
+ public boolean isCommitted() {
return response.isCommitted();
}
- public void reset(){
+ public void reset() {
response.reset();
}
- public void resetBuffer(){
+ public void resetBuffer() {
response.resetBuffer();
}
- public void setBufferSize(int size){
+ public void setBufferSize(int size) {
response.setBufferSize(size);
}
- public void setContentType(java.lang.String type){
+ public void setContentType(java.lang.String type) {
response.setContentType(type);
}
- public void setTitle(java.lang.String title){
+ public void setTitle(java.lang.String title) {
System.out.println("RenderResponseWrapper: cannot setTitle from
a ServletResponse!");
}
Index: PortletRequestWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/PortletRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PortletRequestWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ PortletRequestWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -4,7 +4,9 @@
import javax.servlet.http.*;
import javax.portlet.*;
-/** Class to wrap a ServletRequest so it can be used as a PortletRequest */
+/**
+ * Class to wrap a ServletRequest so it can be used as a PortletRequest
+ */
public class PortletRequestWrapper implements PortletRequest {
protected ServletRequest request;
@@ -14,7 +16,7 @@
public static java.lang.String FORM_AUTH = PortletRequest.FORM_AUTH;
public static java.lang.String USER_INFO = PortletRequest.USER_INFO;
- public PortletRequestWrapper(ServletRequest request){
+ public PortletRequestWrapper(ServletRequest request) {
this.request = request;
}
@@ -28,7 +30,7 @@
public java.lang.String getAuthType() {
if (request instanceof HttpServletRequest) {
- return ((HttpServletRequest)request).getAuthType();
+ return ((HttpServletRequest) request).getAuthType();
}
System.out.println("PortletRequestWrapper: cannot getAuthType
from a ServletRequest!");
return null;
@@ -36,7 +38,7 @@
public java.lang.String getContextPath() {
if (request instanceof HttpServletRequest) {
- return ((HttpServletRequest)request).getContextPath();
+ return ((HttpServletRequest) request).getContextPath();
}
System.out.println("PortletRequestWrapper: cannot
getContextPath from a ServletRequest!");
return null;
@@ -78,8 +80,8 @@
public PortletSession getPortletSession() {
if (request instanceof HttpServletRequest) {
- HttpSession session =
((HttpServletRequest)request).getSession();
- if (session==null) return null;
+ HttpSession session = ((HttpServletRequest) request).getSession();
+ if (session == null) return null;
return new PortletSessionWrapper(session);
}
System.out.println("PortletRequestWrapper: cannot
getPortletSession from a ServletRequest!");
@@ -88,8 +90,8 @@
public PortletSession getPortletSession(boolean create) {
if (request instanceof HttpServletRequest) {
- HttpSession session =
((HttpServletRequest)request).getSession(create);
- if (session==null) return null;
+ HttpSession session = ((HttpServletRequest)
request).getSession(create);
+ if (session == null) return null;
return new PortletSessionWrapper(session);
}
System.out.println("PortletRequestWrapper: cannot
getPortletSession from a ServletRequest!");
@@ -118,7 +120,7 @@
public java.lang.String getRemoteUser() {
if (request instanceof HttpServletRequest) {
- return ((HttpServletRequest)request).getRemoteUser();
+ return ((HttpServletRequest) request).getRemoteUser();
}
System.out.println("PortletRequestWrapper: cannot getRemoteUser
from a ServletRequest!");
return null;
@@ -126,7 +128,7 @@
public java.lang.String getRequestedSessionId() {
if (request instanceof HttpServletRequest) {
- return
((HttpServletRequest)request).getRequestedSessionId();
+ return ((HttpServletRequest) request).getRequestedSessionId();
}
System.out.println("PortletRequestWrapper: cannot
getRequestedSessionId from a ServletRequest!");
return null;
@@ -156,7 +158,7 @@
public java.security.Principal getUserPrincipal() {
if (request instanceof HttpServletRequest) {
- return ((HttpServletRequest)request).getUserPrincipal();
+ return ((HttpServletRequest) request).getUserPrincipal();
}
System.out.println("PortletRequestWrapper: cannot
getUserPrincipal from a ServletRequest!");
return null;
@@ -174,7 +176,7 @@
public boolean isRequestedSessionIdValid() {
if (request instanceof HttpServletRequest) {
- return
((HttpServletRequest)request).isRequestedSessionIdValid();
+ return ((HttpServletRequest) request).isRequestedSessionIdValid();
}
System.out.println("PortletRequestWrapper: cannot
isRequestedSessionIdValid from a ServletRequest!");
return false;
@@ -186,7 +188,7 @@
public boolean isUserInRole(java.lang.String role) {
if (request instanceof HttpServletRequest) {
- return ((HttpServletRequest)request).isUserInRole(role);
+ return ((HttpServletRequest) request).isUserInRole(role);
}
System.out.println("PortletRequestWrapper: cannot isUserInRole
from a ServletRequest!");
return false;
Index: PortletRequestDispatcherWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/PortletRequestDispatcherWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PortletRequestDispatcherWrapper.java 17 Jan 2008 22:15:44 -0000
1.1
+++ PortletRequestDispatcherWrapper.java 15 Oct 2008 11:43:54 -0000
1.2
@@ -3,7 +3,9 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a RequestDispatcher so it can be used as a
PortletRequestDispatcher */
+/**
+ * Class to wrap a RequestDispatcher so it can be used as a
PortletRequestDispatcher
+ */
public class PortletRequestDispatcherWrapper implements
PortletRequestDispatcher {
private RequestDispatcher dispatcher;
@@ -13,8 +15,8 @@
public void include(RenderRequest request, RenderResponse response)
throws PortletException, java.io.IOException {
try {
- dispatcher.include( new ServletRequestWrapper(request),
new ServletResponseWrapper(response));
- } catch (ServletException e ){
+ dispatcher.include(new ServletRequestWrapper(request), new
ServletResponseWrapper(response));
+ } catch (ServletException e) {
throw new PortletException(e);
}
}
Index: ServletRequestWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/ServletRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: PortletSessionWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/PortletSessionWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PortletSessionWrapper.java 3 Jul 2008 20:55:16 -0000 1.2
+++ PortletSessionWrapper.java 15 Oct 2008 11:43:54 -0000 1.3
@@ -4,7 +4,9 @@
import javax.servlet.http.*;
import javax.portlet.*;
-/** Class to wrap a HttpSession so it can be used as a PortletSession */
+/**
+ * Class to wrap a HttpSession so it can be used as a PortletSession
+ */
public class PortletSessionWrapper implements PortletSession {
public final static int APPLICATION_SCOPE =
PortletSession.APPLICATION_SCOPE;
@@ -13,20 +15,20 @@
private HttpSession session;
private int SCOPE = APPLICATION_SCOPE;
- public PortletSessionWrapper(HttpSession session){
+ public PortletSessionWrapper(HttpSession session) {
this.session = session;
}
// scope (default APPLICATION_SCOPE) determines what scope
// the attributes in the contained HttpSession are 'in'.
// Change here to use PORTLET_SCOPE if necessary.
- public PortletSessionWrapper(HttpSession session, int scope){
+ public PortletSessionWrapper(HttpSession session, int scope) {
this.session = session;
this.SCOPE = scope;
}
- public java.lang.Object getAttribute(java.lang.String name){
- if (this.SCOPE == PORTLET_SCOPE){
+ public java.lang.Object getAttribute(java.lang.String name) {
+ if (this.SCOPE == PORTLET_SCOPE) {
return session.getAttribute(name);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with portlet-scoped attributes on this HttpSession!");
@@ -34,8 +36,8 @@
}
}
- public java.lang.Object getAttribute(java.lang.String name, int scope){
- if (this.SCOPE == scope){
+ public java.lang.Object getAttribute(java.lang.String name, int scope) {
+ if (this.SCOPE == scope) {
return session.getAttribute(name);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with scoped attributes on this HttpSession!");
@@ -43,8 +45,8 @@
}
}
- public java.util.Enumeration getAttributeNames(){
- if (this.SCOPE == PORTLET_SCOPE){
+ public java.util.Enumeration getAttributeNames() {
+ if (this.SCOPE == PORTLET_SCOPE) {
return session.getAttributeNames();
} else {
System.out.println("PortletSessionWrapper: cannot deal
with portlet-scoped attributes on this HttpSession!");
@@ -52,8 +54,8 @@
}
}
- public java.util.Enumeration getAttributeNames(int scope){
- if (this.SCOPE == scope){
+ public java.util.Enumeration getAttributeNames(int scope) {
+ if (this.SCOPE == scope) {
return session.getAttributeNames();
} else {
System.out.println("PortletSessionWrapper: cannot deal
with scoped attributes on this HttpSession!");
@@ -61,67 +63,67 @@
}
}
- public long getCreationTime(){
+ public long getCreationTime() {
return session.getCreationTime();
}
- public java.lang.String getId(){
+ public java.lang.String getId() {
return session.getId();
}
- public long getLastAccessedTime(){
+ public long getLastAccessedTime() {
return session.getLastAccessedTime();
}
- public int getMaxInactiveInterval(){
+ public int getMaxInactiveInterval() {
return session.getMaxInactiveInterval();
}
- public PortletContext getPortletContext(){
+ public PortletContext getPortletContext() {
return new PortletContextWrapper(session.getServletContext());
}
- public void invalidate(){
+ public void invalidate() {
session.invalidate();
}
- public boolean isNew(){
+ public boolean isNew() {
return session.isNew();
}
- public void removeAttribute(java.lang.String name){
- if (this.SCOPE == PORTLET_SCOPE){
+ public void removeAttribute(java.lang.String name) {
+ if (this.SCOPE == PORTLET_SCOPE) {
session.removeAttribute(name);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with portlet-scoped attributes on this HttpSession!");
}
}
- public void removeAttribute(java.lang.String name, int scope){
- if (this.SCOPE == scope){
+ public void removeAttribute(java.lang.String name, int scope) {
+ if (this.SCOPE == scope) {
session.removeAttribute(name);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with scoped attributes on this HttpSession!");
}
}
- public void setAttribute(java.lang.String name, java.lang.Object value){
- if (this.SCOPE == PORTLET_SCOPE){
+ public void setAttribute(java.lang.String name, java.lang.Object value) {
+ if (this.SCOPE == PORTLET_SCOPE) {
session.setAttribute(name, value);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with portlet-scoped attributes on this HttpSession!");
}
}
- public void setAttribute(java.lang.String name, java.lang.Object value,
int scope){
- if (this.SCOPE == scope){
+ public void setAttribute(java.lang.String name, java.lang.Object value, int
scope) {
+ if (this.SCOPE == scope) {
session.setAttribute(name, value);
} else {
System.out.println("PortletSessionWrapper: cannot deal
with scoped attributes on this HttpSession!");
}
}
- public void setMaxInactiveInterval(int interval){
+ public void setMaxInactiveInterval(int interval) {
session.setMaxInactiveInterval(interval);
}
Index: RequestDispatcherWrapper.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/portlet/wrappers/RequestDispatcherWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RequestDispatcherWrapper.java 17 Jan 2008 22:15:44 -0000 1.1
+++ RequestDispatcherWrapper.java 15 Oct 2008 11:43:54 -0000 1.2
@@ -3,11 +3,13 @@
import javax.servlet.*;
import javax.portlet.*;
-/** Class to wrap a PortletRequestDispatcher so it can be used as a
RequestDispatcher */
+/**
+ * Class to wrap a PortletRequestDispatcher so it can be used as a
RequestDispatcher
+ */
public class RequestDispatcherWrapper implements RequestDispatcher {
private PortletRequestDispatcher dispatcher;
- public RequestDispatcherWrapper(PortletRequestDispatcher dispatcher){
+ public RequestDispatcherWrapper(PortletRequestDispatcher dispatcher) {
this.dispatcher = dispatcher;
}
@@ -17,8 +19,8 @@
public void include(ServletRequest request, ServletResponse response)
throws ServletException, java.io.IOException {
try {
- dispatcher.include( new RenderRequestWrapper(request),
new RenderResponseWrapper(response));
- } catch (PortletException e ){
+ dispatcher.include(new RenderRequestWrapper(request), new
RenderResponseWrapper(response));
+ } catch (PortletException e) {
throw new ServletException(e);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
