From: Julien V. <ju...@jb...> - 2006-04-26 22:42:27
|
User: julien Date: 06/04/26 18:42:21 Modified: core/src/main/org/jboss/portal/core/command/portlet CoreActionContext.java CoreInvocationContext.java Log: upgrade handling of action making the disctinction between form params and interaction params Revision Changes Path 1.10 +14 -6 jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CoreActionContext.java =================================================================== RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- CoreActionContext.java 26 Apr 2006 12:33:20 -0000 1.9 +++ CoreActionContext.java 26 Apr 2006 22:42:21 -0000 1.10 @@ -40,13 +40,14 @@ /** * @author <a href="mailto:ju...@jb...">Julien Viet</a> - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class CoreActionContext extends CoreInvocationContext implements ActionContext { private HttpServletRequest req; - private Parameters parameters; + private PortletNavigationalState interactionState; + private Parameters form; public CoreActionContext( ExecutionContext executionContext, @@ -55,12 +56,14 @@ PortletNavigationalState navigationalState, WindowState windowState, Mode mode, - Parameters parameters, + PortletNavigationalState interactionState, + Parameters form, Window window) { super(executionContext, invocation, portal, navigationalState, mode, windowState, window); this.req = invocation.getRequest().getContext().getClientRequest(); - this.parameters = parameters; + this.interactionState = interactionState; + this.form = form; } @@ -89,9 +92,14 @@ return req.getContentType(); } - public Parameters getParameters() + public PortletNavigationalState getInteractionState() { - return parameters; + return interactionState; + } + + public Parameters getForm() + { + return form; } protected PortletInvocation newInvocation() 1.17 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CoreInvocationContext.java =================================================================== RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- CoreInvocationContext.java 26 Apr 2006 16:09:21 -0000 1.16 +++ CoreInvocationContext.java 26 Apr 2006 22:42:21 -0000 1.17 @@ -55,7 +55,7 @@ /** * @author <a href="mailto:ju...@jb...">Julien Viet</a> - * @version $Revision: 1.16 $ + * @version $Revision: 1.17 $ */ public abstract class CoreInvocationContext implements InvocationContext { @@ -150,7 +150,7 @@ ControllerCommand cmd = null; if (portletURL instanceof ActionURL) { - cmd = new InvokeWindowActionCommand(window.getId(), portletURL.getMode(), portletURL.getWindowState(), ((ActionURL)portletURL).getParameters()); + cmd = new InvokeWindowActionCommand(window.getId(), portletURL.getMode(), portletURL.getWindowState(), ((ActionURL)portletURL).getInteractionState(), null); } else { |