Author: julien(a)jboss.com
Date: 2008-03-05 14:29:37 -0500 (Wed, 05 Mar 2008)
New Revision: 10216
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
Log:
rename attributes to requestAttributes as it is confusing with the generic invocation
attributes
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-03-05
19:29:25 UTC (rev 10215)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-03-05
19:29:37 UTC (rev 10216)
@@ -208,7 +208,7 @@
Conversation conversation,
PortletInvocation invocation) throws Exception, InvocationException
{
- invocation.setAttributes(conversation.getAttributes());
+ invocation.setRequestAttributes(conversation.getAttributes());
// Set the id parameter
ParametersStateString inNS =
(ParametersStateString)invocation.getNavigationalState();
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-05
19:29:25 UTC (rev 10215)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-05
19:29:37 UTC (rev 10216)
@@ -150,9 +150,9 @@
//
PortletRequestAttributes attributes = new
PortletRequestAttributes(invocation.getSecurityContext(), container, userContext,
realReq);
- if (invocation.getAttributes() != null)
+ if (invocation.getRequestAttributes() != null)
{
- attributes.setAttributeMap(invocation.getAttributes());
+ attributes.setAttributeMap(invocation.getRequestAttributes());
}
//
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-03-05
19:29:25 UTC (rev 10215)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-03-05
19:29:37 UTC (rev 10216)
@@ -40,7 +40,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Set;
import java.util.Map;
/**
@@ -75,8 +74,8 @@
/** The target portlet. */
protected PortletContext target;
- /** . */
- protected Map<String, Object> attributes;
+ /** The portlet request attributes. */
+ protected Map<String, Object> requestAttributes;
/** The invocation context. */
protected PortletInvocationContext ctx;
@@ -290,13 +289,13 @@
this.windowContext = windowContext;
}
- public Map<String, Object> getAttributes()
+ public Map<String, Object> getRequestAttributes()
{
- return attributes;
+ return requestAttributes;
}
- public void setAttributes(Map<String, Object> attributes)
+ public void setRequestAttributes(Map<String, Object> requestAttributes)
{
- this.attributes = attributes;
+ this.requestAttributes = requestAttributes;
}
}
Show replies by date