Author: julien(a)jboss.com Date: 2008-02-04 20:13:32 -0500 (Mon, 04 Feb 2008) New Revision: 9756 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java Log: update ActionURL and ResourceURL to have nav state related info (as it should be, I tried to simplify but after all it does not simplify) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -34,4 +34,11 @@ * @return the interaction state */ StateString getInteractionState(); + + /** + * Return the navigational state that may be null. + * + * @return the navigational state + */ + StateString getNavigationalState(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -23,6 +23,8 @@ package org.jboss.portal.portlet; import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -52,4 +54,24 @@ */ CacheLevel getCacheability(); + /** + * Return the navigational state that may be null. + * + * @return the navigational state + */ + StateString getNavigationalState(); + + /** + * Returns the mode that may be null. + * + * @return the mode + */ + Mode getMode(); + + /** + * Returns the window state that may be null. + * + * @return the window state + */ + WindowState getWindowState(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.jsr168.PortletParameterMap; @@ -49,7 +48,7 @@ public static PortletURLImpl createActionURL(PortletInvocation invocation, PortletRequestImpl preq) { - InternalActionURL url = new InternalActionURL(); + InternalActionURL url = new InternalActionURL(invocation.getNavigationalState()); return new PortletURLImpl(invocation, preq, url, true); } @@ -197,9 +196,13 @@ /** . */ private final ParametersStateString interactionState; - private InternalActionURL() + /** . */ + private final StateString navigationalState; + + private InternalActionURL(StateString navigationalState) { this.interactionState = ParametersStateString.create(); + this.navigationalState = navigationalState; } private InternalActionURL(InternalActionURL original) @@ -208,6 +211,7 @@ // this.interactionState = ParametersStateString.create(ParameterMap.clone(original.interactionState.getParameters())); + this.navigationalState = original.navigationalState; } public StateString getInteractionState() @@ -238,6 +242,11 @@ { return ParameterMap.clone(interactionState.getParameters()); } + + public StateString getNavigationalState() + { + return navigationalState; + } } private static class InternalRenderURL extends InternalPortletURL implements RenderURL Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -28,6 +28,8 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import javax.portlet.ResourceURL; import javax.portlet.PortletURLGenerationListener; @@ -159,7 +161,11 @@ public static ResourceURLImpl createResourceURL(PortletInvocation invocation, PortletRequestImpl preq) { - return new ResourceURLImpl(invocation, preq, new InternalResourceURL(), true); + return new ResourceURLImpl( + invocation, + preq, + new InternalResourceURL(invocation.getNavigationalState(), invocation.getMode(),invocation.getWindowState()), + true); } private static class InternalResourceURL extends InternalContainerURL implements org.jboss.portal.portlet.ResourceURL @@ -177,9 +183,21 @@ /** . */ private ParametersStateString parameters; - private InternalResourceURL() + /** . */ + private final StateString navigationalState; + + /** . */ + private final Mode mode; + + /** . */ + private final WindowState windowState; + + private InternalResourceURL(StateString navigationalState, Mode mode, WindowState windowState) { this.parameters = ParametersStateString.create(); + this.navigationalState = navigationalState; + this.mode = mode; + this.windowState = windowState; } private InternalResourceURL(InternalResourceURL original) @@ -188,6 +206,9 @@ this.parentCacheLevel = original.parentCacheLevel; this.cacheLevel = original.cacheLevel; this.parameters = ParametersStateString.create(ParameterMap.clone(original.parameters.getParameters())); + this.navigationalState = original.navigationalState; + this.mode = original.mode; + this.windowState = original.windowState; } protected void setParameter(String name, String value) @@ -238,5 +259,20 @@ } } } + + public StateString getNavigationalState() + { + return navigationalState; + } + + public Mode getMode() + { + return mode; + } + + public WindowState getWindowState() + { + return windowState; + } } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -36,7 +36,6 @@ import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -55,9 +54,6 @@ final Portlet portlet; /** . */ - final WindowNavigationalState windowNS; - - /** . */ final HttpServletRequest clientReq; /** . */ @@ -68,13 +64,11 @@ public PortletURLRenderer( PageNavigationalState pageNS, - WindowNavigationalState windowNS, Portlet portlet, HttpServletRequest clientReq, HttpServletResponse clientResp) { this.pageNS = pageNS; - this.windowNS = windowNS; this.portlet = portlet; this.clientReq = clientReq; this.clientResp = clientResp; @@ -152,13 +146,9 @@ ActionURL actionURL = (ActionURL)containerURL; // - if (windowNS != null) + if (actionURL.getNavigationalState() != null) { - StateString portletNS = windowNS.getPortletNavigationalState(); - if (portletNS != null) - { - parameters.put(NAVIGATIONAL_STATE, windowNS.getPortletNavigationalState().getStringValue()); - } + parameters.put(NAVIGATIONAL_STATE, actionURL.getNavigationalState().getStringValue()); } // @@ -210,25 +200,26 @@ // if (cacheability != CacheLevel.FULL) { - if (windowNS != null) + if (resourceURL.getNavigationalState() != null) { - StateString portletNS = windowNS.getPortletNavigationalState(); - if (portletNS != null) - { - parameters.put(NAVIGATIONAL_STATE, windowNS.getPortletNavigationalState().getStringValue()); - } + parameters.put(NAVIGATIONAL_STATE, resourceURL.getNavigationalState().getStringValue()); + } - // - parameters.put(MODE, windowNS.getMode().toString()); + // + if (resourceURL.getMode() != null) + { + parameters.put(MODE, resourceURL.getMode().toString()); + } - // - parameters.put(WINDOW_STATE, windowNS.getWindowState().toString()); + // + if (resourceURL.getWindowState() != null) + { + parameters.put(WINDOW_STATE, resourceURL.getWindowState().toString()); + } - // - if (cacheability == CacheLevel.PAGE) - { - parameters.put(PAGE_STATE, pageState); - } + if (cacheability == CacheLevel.PAGE) + { + parameters.put(PAGE_STATE, pageState); } } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -24,7 +24,6 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.info.ParameterInfo; import javax.xml.namespace.QName; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -217,7 +217,7 @@ ParameterMap publicNS = pageNS.getPublicNavigationalState(portlet); // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portletActionRequest.getWindowNavigationalState(), portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); // TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); @@ -263,7 +263,7 @@ HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); WindowNavigationalState windowNS = pageNS.getWindowNavigationalState(portlet.getContext().getId()); - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, windowNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); // if (windowNS == null) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -144,7 +144,7 @@ WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, mode, windowState); // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, windowNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); // TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05 00:22:45 UTC (rev 9755) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05 01:13:32 UTC (rev 9756) @@ -228,7 +228,7 @@ HttpServletResponse resp = context.getClientResponse(); // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, windowNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); // TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), false);