Author: julien(a)jboss.com Date: 2007-09-18 11:28:25 -0400 (Tue, 18 Sep 2007) New Revision: 8323 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java Log: JBPORTAL-1604: remove the necessity to set window state and mode on the event Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:12:03 UTC (rev 8322) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:28:25 UTC (rev 8323) @@ -36,7 +36,6 @@ import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.invocation.response.RenderResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.common.FixMe; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -89,28 +88,14 @@ } } - public static ControllerResponse createActionResponse(String instanceId, ActionContext actionContext, PortletInvocationResponse response) + public static ControllerResponse createActionResponse(String instanceId, PortletInvocationResponse response) { if (response instanceof org.jboss.portal.portlet.invocation.response.RenderResponse) { RenderResponse renderResult = (RenderResponse)response; // - Mode mode = renderResult.getMode(); - if (mode == null) - { - mode = actionContext.getMode(); - } - - // - WindowState windowState = renderResult.getWindowState(); - if (windowState == null) - { - windowState = actionContext.getWindowState(); - } - - // - return new PortletInstanceActionResponse(instanceId, windowState, mode, renderResult.getNavigationalState()); + return new PortletInstanceActionResponse(instanceId, null, null, renderResult.getNavigationalState()); } else { Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:28:25 UTC (rev 8323) @@ -34,7 +34,6 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.Mode; @@ -103,7 +102,7 @@ PortletInvocationResponse response = instance.invoke(action); // - return ControllerResponseFactory.createActionResponse(instanceId, (ActionContext)action.getContext(), response); + return ControllerResponseFactory.createActionResponse(instanceId, response); } catch (PortletInvokerException e) { Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:28:25 UTC (rev 8323) @@ -41,7 +41,6 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; /** @@ -79,6 +78,8 @@ throws IllegalArgumentException { super(windowId, mode, windowState); + + // this.navigationalState = navigationalState; this.interactionState = interactionState; this.formParameters = formParameters; @@ -145,6 +146,20 @@ { try { + Mode mode = this.mode; + if (mode == null) + { + mode = Mode.VIEW; + } + + // + WindowState windowState = this.windowState; + if (windowState == null) + { + windowState = WindowState.NORMAL; + } + + // PortletInvocation invocation = PortletInvocationFactory.createAction( context, mode, Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-09-18 15:12:03 UTC (rev 8322) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-09-18 15:28:25 UTC (rev 8323) @@ -86,7 +86,6 @@ { // We can redirect newEvent = new WindowActionEvent(windowB); - newEvent.setMode(wae.getMode()); newEvent.setWindowState(WindowState.MAXIMIZED); newEvent.setParameters(wae.getParameters()); }