Author: julien(a)jboss.com Date: 2007-04-29 16:16:18 -0400 (Sun, 29 Apr 2007) New Revision: 7133 Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java Log: - create WindowRenderEvent correctly Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2007-04-29 13:54:48 UTC (rev 7132) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2007-04-29 20:16:18 UTC (rev 7133) @@ -44,9 +44,11 @@ import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.event.PortalEventListenerRegistry; import org.jboss.portal.core.impl.api.CorePortalNode; import org.jboss.portal.core.impl.api.CorePortalRuntimeContext; +import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.StateString; @@ -261,12 +263,24 @@ } else if (cmd instanceof RenderWindowCommand) { + WindowRenderEvent event = new WindowRenderEvent(node); + + // RenderWindowCommand rwc = (RenderWindowCommand)cmd; + NavigationalStateKey key = new NavigationalStateKey(WindowNavigationalState.class, rwc.getTargetId()); + WindowNavigationalState navstate = (WindowNavigationalState)cmd.getControllerContext().getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE, key); + if (navstate != null) + { + event.setMode(navstate.getMode()); + event.setWindowState(navstate.getWindowState()); - // - WindowRenderEvent event = new WindowRenderEvent(node); - event.setMode(rwc.getMode()); - event.setWindowState(rwc.getWindowState()); + StateString parametersState = navstate.getState(); + if (parametersState instanceof PortletParametersStateString) + { + Map params = ((PortletParametersStateString)parametersState).getParameters(); + event.setParameters(params); + } + } } } else if (cmd instanceof RenderPageCommand)