Author: julien(a)jboss.com Date: 2008-01-16 07:30:17 -0500 (Wed, 16 Jan 2008) New Revision: 9523 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java Log: update Portlet module to take in account common module updates to TypeMap and ParameterMap Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-16 12:18:04 UTC (rev 9522) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-16 12:30:17 UTC (rev 9523) @@ -55,6 +55,7 @@ import java.util.UUID; import java.util.List; import java.util.LinkedList; +import java.util.HashMap; import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; @@ -186,7 +187,14 @@ // if (pi != null) { - update.publicNavigationalState.setValues(name, values); + for (String value : values) + { + if (value == null) + { + throw new IllegalArgumentException(); + } + } + update.publicNavigationalState.put(name, values.clone()); } else { @@ -371,7 +379,7 @@ { /** The navigational state returned. */ - protected ParameterMap navigationalState = new ParameterMap(); + protected ParameterMap navigationalState = new ParameterMap(ParameterMap.AccessMode.get(true, false)); /** The new window state requested. */ protected org.jboss.portal.WindowState windowState; @@ -380,7 +388,7 @@ protected Mode mode; /** The update to the shared parameters. */ - protected ParameterMap publicNavigationalState = new ParameterMap(); + protected Map<String,String[]> publicNavigationalState; protected StateResponse createResponse() { @@ -389,7 +397,7 @@ // response.setMode(mode); response.setWindowState(windowState); - response.setPublicNavigationalState(publicNavigationalState); + response.setPublicNavigationalStateUpdates(publicNavigationalState); response.setNavigationalState(new ParametersStateString(navigationalState)); // Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2008-01-16 12:18:04 UTC (rev 9522) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2008-01-16 12:30:17 UTC (rev 9523) @@ -27,6 +27,8 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; +import java.util.Map; + /** * Update the navigational state. * @@ -45,15 +47,18 @@ /** The new mode requested. */ protected Mode mode; - /** The update to the shared parameters. */ - protected ParameterMap publicNavigationalState; + /** + * The update to the public parameters. Each entry having a zero length value must be interpeted as + * a public parameter removal otherwise it must be interpreted as a public parameter values update. + */ + protected Map<String, String[]> publicNavigationalStateUpdates; public UpdateNavigationalStateResponse() { navigationalState = null; windowState = null; mode = null; - publicNavigationalState = null; + publicNavigationalStateUpdates = null; } public Mode getMode() @@ -86,13 +91,13 @@ this.navigationalState = state; } - public ParameterMap getPublicNavigationalState() + public Map<String, String[]> getPublicNavigationalStateUpdates() { - return publicNavigationalState; + return publicNavigationalStateUpdates; } - public void setPublicNavigationalState(ParameterMap publicNavigationalState) + public void setPublicNavigationalStateUpdates(Map<String, String[]> publicNavigationalStateUpdates) { - this.publicNavigationalState = publicNavigationalState; + this.publicNavigationalStateUpdates = publicNavigationalStateUpdates; } } 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-16 12:18:04 UTC (rev 9522) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-16 12:30:17 UTC (rev 9523) @@ -502,23 +502,23 @@ portalNS.setWindowNavigationalState(portletId, windowNS); // Now update shared state scoped at page - ParameterMap publicNS = update.getPublicNavigationalState(); - if (publicNS != null) - { - NavigationInfo navigationInfo = portlet.getInfo().getNavigation(); - for (Map.Entry<String, String[]> entry : publicNS.entrySet()) - { - String id = entry.getKey(); - ParameterInfo parameterInfo = navigationInfo.getPublicParameter(id); - - // - if (parameterInfo != null) - { - QName name = parameterInfo.getName(); - portalNS.getPageNavigationalState().put(name, entry.getValue()); - } - } - } +// Map<String, String[]> publicNS = update.getPublicNavigationalStateUpdates(); +// if (publicNS != null) +// { +// NavigationInfo navigationInfo = portlet.getInfo().getNavigation(); +// for (Map.Entry<String, String[]> entry : publicNS.entrySet()) +// { +// String id = entry.getKey(); +// ParameterInfo parameterInfo = navigationInfo.getPublicParameter(id); +// +// // +// if (parameterInfo != null) +// { +// QName name = parameterInfo.getName(); +// portalNS.getPageNavigationalState().put(name, entry.getValue()); +// } +// } +// } } static class Action