Author: julien(a)jboss.com Date: 2008-04-14 09:44:29 -0400 (Mon, 14 Apr 2008) New Revision: 10580 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java Log: avoid to use ParameterMap in interfaces as it is really the implementation of a Map<String, String[]> that is very convenient. the framework should not force the client of the framework to use that type Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -311,7 +311,7 @@ } // - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; if (pageNavigationalState != null) { publicNS = pageNavigationalState.getPortletPublicNavigationalState(portletRequest.getWindowId()); @@ -347,7 +347,7 @@ } // - ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(event.getWindowId()); + Map<String, String[]> publicNS = pageNavigationalState.getPortletPublicNavigationalState(event.getWindowId()); // PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(event.getWindowId(), pageNavigationalState); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -38,6 +38,8 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import java.util.Map; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -62,7 +64,7 @@ Mode mode = null; WindowState windowState = null; PortletPageNavigationalState pageNavigationalState = null; - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; StateString portletNS = null; CacheLevel cacheability; Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -80,7 +80,7 @@ return windows.get(portletWindowId); } - public ParameterMap getPortletPublicNavigationalState(String portletWindowId) + public Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) { PortletInfo info = context.portletControllerContext.getPortletInfo(portletWindowId); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.state; -import org.jboss.portal.common.util.ParameterMap; - import javax.xml.namespace.QName; import java.util.Map; import java.util.Set; @@ -74,7 +72,7 @@ * @return the portlet public navigational state * @throws IllegalArgumentException if an argument is not valid */ - ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException; + Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException; /** * <p>Update the public navigational state of a portlet window. The interpretation of what should be updated is left up Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -39,7 +39,6 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; -import org.jboss.portal.common.util.ParameterMap; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; @@ -135,7 +134,7 @@ } // - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; if (pageNavigationalState != null) { publicNS = pageNavigationalState.getPortletPublicNavigationalState(windowId); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -40,6 +40,7 @@ import org.jboss.portal.Mode; import java.io.Serializable; +import java.util.Map; /** * Cache markup on the portal. @@ -66,7 +67,7 @@ // StateString navigationalState = renderInvocation.getNavigationalState(); - ParameterMap publicNavigationalState = renderInvocation.getPublicNavigationalState(); + Map<String, String[]> publicNavigationalState = renderInvocation.getPublicNavigationalState(); WindowState windowState = renderInvocation.getWindowState(); Mode mode = renderInvocation.getMode(); @@ -79,7 +80,7 @@ // Check time validity for fragment boolean useEntry = false; StateString entryNavigationalState = cachedEntry.navigationalState; - ParameterMap entryPublicNavigationalState = cachedEntry.publicNavigationalState; + Map<String, String[]> entryPublicNavigationalState = cachedEntry.publicNavigationalState; // Then check nav state equality if (navigationalState == null) @@ -126,7 +127,9 @@ } else { - useEntry = publicNavigationalState.equals(entryPublicNavigationalState); + ParameterMap publicPM = ParameterMap.wrap(publicNavigationalState); + ParameterMap entryPM = ParameterMap.wrap(entryPublicNavigationalState); + useEntry = publicPM.equals(entryPM); } } @@ -243,7 +246,7 @@ private final Mode mode; /** . */ - private final ParameterMap publicNavigationalState; + private final Map<String, String[]> publicNavigationalState; /** The timed content. */ private final ContentRef contentRef; @@ -256,7 +259,7 @@ public CacheEntry( StateString navigationalState, - ParameterMap publicNavigationalState, + Map<String, String[]> publicNavigationalState, WindowState windowState, Mode mode, ContentResponse content, Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -196,7 +196,7 @@ return publicParameters; } - protected static ParameterMap safeBuildPublicParameters(NavigationInfo navigationInfo, ParameterMap publicNavigationalParameters) + protected static ParameterMap safeBuildPublicParameters(NavigationInfo navigationInfo, Map<String, String[]> publicNavigationalParameters) { if (publicNavigationalParameters != null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -24,7 +24,6 @@ import org.jboss.portal.common.invocation.Invocation; import org.jboss.portal.common.invocation.Scope; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.PortalContext; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -63,7 +62,7 @@ protected StateString navigationalState; /** . */ - protected ParameterMap publicNavigationalState; + protected Map<String, String[]> publicNavigationalState; /** . */ protected Mode mode; @@ -189,12 +188,12 @@ this.navigationalState = navigationalState; } - public ParameterMap getPublicNavigationalState() + public Map<String, String[]> getPublicNavigationalState() { return publicNavigationalState; } - public void setPublicNavigationalState(ParameterMap publicNavigationalState) + public void setPublicNavigationalState(Map<String, String[]> publicNavigationalState) { this.publicNavigationalState = publicNavigationalState; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -26,7 +26,6 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MultiValuedPropertyMap; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -55,6 +54,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -168,7 +168,7 @@ } // - ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); + Map<String, String[]> publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); RenderInvocation render = createRenderInvocation(context, properties, pageNavigationalState, portlet, windowNS, mode, windowState, portletNS, publicNS); @@ -216,7 +216,7 @@ Mode mode, WindowState windowState, StateString portletNS, - ParameterMap publicNS) + Map<String, String[]> publicNS) { HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -24,7 +24,6 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; -import org.jboss.portal.common.util.ParameterMap; import javax.xml.namespace.QName; import java.util.Map; @@ -69,7 +68,7 @@ defaultState.setPortletWindowNavigationalState(portletWindowId, portletWindowState); } - public ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException + public Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException { return defaultState.getPortletPublicNavigationalState(portletWindowId); }