Author: julien(a)jboss.com Date: 2008-01-25 08:30:29 -0500 (Fri, 25 Jan 2008) New Revision: 9606 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java Log: update controller to use WindowNavigationalState instead of (mode, windowState, portletNS) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-25 12:53:59 UTC (rev 9605) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-25 13:30:29 UTC (rev 9606) @@ -120,9 +120,9 @@ // UpdateNavigationalStateResponse updateNavigationalState = new UpdateNavigationalStateResponse(); - updateNavigationalState.setMode(portletRenderRequest.mode); - updateNavigationalState.setWindowState(portletRenderRequest.windowState); - updateNavigationalState.setNavigationalState(portletRenderRequest.navigationalState); + updateNavigationalState.setMode(portletRenderRequest.windowNavigationalState.getMode()); + updateNavigationalState.setWindowState(portletRenderRequest.windowNavigationalState.getWindowState()); + updateNavigationalState.setNavigationalState(portletRenderRequest.windowNavigationalState.getPortletNavigationalState()); updateNavigationalState.setPublicNavigationalStateUpdates(portletRenderRequest.publicNavigationalStateChanges); // @@ -136,27 +136,24 @@ PageNavigationalState pageNS = portletActionRequest.pageState; // - Mode mode = portletActionRequest.mode; + Mode mode = portletActionRequest.windowNavigationalState.getMode(); if (mode == null) { mode = Mode.VIEW; } // - WindowState windowState = portletActionRequest.windowState; + WindowState windowState = portletActionRequest.windowNavigationalState.getWindowState(); if (windowState == null) { windowState = WindowState.NORMAL; } // - WindowNavigationalState windowNS = new WindowNavigationalState(portletActionRequest.navigationalState, mode, windowState); - - // ParameterMap publicNS = pageNS.getPublicNavigationalState(portlet); // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, windowNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portletActionRequest.windowNavigationalState, portlet, req, resp); // TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); @@ -164,7 +161,7 @@ renderer, mode, windowState, - portletActionRequest.navigationalState, + portletActionRequest.windowNavigationalState.getPortletNavigationalState(), publicNS, MARKUP_INFO, portletActionRequest.interactionState, @@ -208,9 +205,9 @@ if (portletResourceRequest instanceof PortletScopedPortletResourceRequest) { PortletScopedPortletResourceRequest portletScopedRequest = (PortletScopedPortletResourceRequest)portletResourceRequest; - mode = portletScopedRequest.mode; - windowState = portletScopedRequest.windowState; - portletNS = portletScopedRequest.navigationalState; + mode = portletScopedRequest.windowNavigationalState.getMode(); + windowState = portletScopedRequest.windowNavigationalState.getWindowState(); + portletNS = portletScopedRequest.windowNavigationalState.getPortletNavigationalState(); // if (portletResourceRequest instanceof PageScopedFullPortletResourceRequest) @@ -876,28 +873,18 @@ final PageNavigationalState pageState; /** . */ - final StateString navigationalState; + final WindowNavigationalState windowNavigationalState; - /** . */ - final Mode mode; - - /** . */ - final WindowState windowState; - PortletRequest( PortletControllerContext controllerContext, String portletId, - Mode mode, - WindowState windowState, - StateString navigationalState, + WindowNavigationalState windowNavigationalState, PageNavigationalState pageState) { super(controllerContext, portletId); // - this.mode = mode; - this.windowState = windowState; - this.navigationalState = navigationalState; + this.windowNavigationalState = windowNavigationalState; this.pageState = pageState; } } @@ -963,30 +950,20 @@ { /** . */ - final StateString navigationalState; + final WindowNavigationalState windowNavigationalState; - /** . */ - final Mode mode; - - /** . */ - final WindowState windowState; - PortletScopedPortletResourceRequest( PortletControllerContext controllerContext, String portletId, String resourceId, StateString resourceState, ParameterMap bodyParameters, - StateString navigationalState, - Mode mode, - WindowState windowState) + WindowNavigationalState windowNavigationalState) { super(controllerContext, portletId, resourceId, resourceState, bodyParameters); // - this.mode = mode; - this.windowState = windowState; - this.navigationalState = navigationalState; + this.windowNavigationalState = windowNavigationalState; } } @@ -1002,12 +979,10 @@ String resourceId, StateString resourceState, ParameterMap bodyParameters, - StateString navigationalState, PageNavigationalState pageState, - Mode mode, - WindowState windowState) + WindowNavigationalState windowNavigationalState) { - super(controllerContext, portletId, resourceId, resourceState, bodyParameters, navigationalState, mode, windowState); + super(controllerContext, portletId, resourceId, resourceState, bodyParameters, windowNavigationalState); // this.pageState = pageState; @@ -1028,12 +1003,10 @@ String portletId, StateString interactionState, ParameterMap bodyParameters, - StateString navigationalState, - Mode mode, - WindowState windowState, + WindowNavigationalState windowNavigationalState, PageNavigationalState pageState) { - super(controllerContext, portletId, mode, windowState, navigationalState, pageState); + super(controllerContext, portletId, windowNavigationalState, pageState); // this.interactionState = interactionState; @@ -1050,13 +1023,11 @@ public PortletRenderRequest( PortletControllerContext controllerContext, String portletId, - StateString navigationalState, + WindowNavigationalState windowNavigationalState, Map<String, String[]> publicNavigationalStateChanges, - Mode mode, - WindowState windowState, PageNavigationalState pageState) { - super(controllerContext, portletId, mode, windowState, navigationalState, pageState); + super(controllerContext, portletId, windowNavigationalState, pageState); // this.publicNavigationalStateChanges = publicNavigationalStateChanges; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-25 12:53:59 UTC (rev 9605) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-25 13:30:29 UTC (rev 9606) @@ -131,6 +131,9 @@ } // + WindowNavigationalState windowNavigationalState = new WindowNavigationalState(navigationalState, mode, windowState); + + // String type = req.getParameter(LIFECYCLE_TYPE); if (RESOURCE_LIFECYCLE.equals(type)) { @@ -166,9 +169,7 @@ resourceId, resourceState, formParameters, - navigationalState, - mode, - windowState); + windowNavigationalState); break; case PAGE: request = new PortletController.PageScopedFullPortletResourceRequest( @@ -177,10 +178,8 @@ resourceId, resourceState, formParameters, - navigationalState, pageState, - mode, - windowState); + windowNavigationalState); break; } } @@ -203,9 +202,7 @@ targetId, interactionState, formParameters, - navigationalState, - mode, - windowState, + windowNavigationalState, pageState); } else @@ -216,10 +213,8 @@ request = new PortletController.PortletRenderRequest( this, targetId, - navigationalState, + windowNavigationalState, publicNavigationalStateChanges, - mode, - windowState, pageState); } }