Author: julien(a)jboss.com Date: 2008-01-15 18:52:11 -0500 (Tue, 15 Jan 2008) New Revision: 9520 Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java 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/impl/PortletRequestDecoder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 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/PortletURLRenderer.java Log: - rename PortletParametersStateString to ParametersStateString - moved a factory method of ParametersStateString to a plain constructor Copied: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java (from rev 9519, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java) =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -0,0 +1,347 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet; + +import org.jboss.portal.common.util.Base64; +import org.jboss.portal.common.util.ParameterMap; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * A set of parameters. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6549 $ + */ +public class ParametersStateString extends StateString implements Serializable +{ + /** . */ + public static final String JBPNS_PREFIX = "JBPNS_"; + + /** The serialVersionUID */ + private static final long serialVersionUID = -8529807471117491810L; + + /** . */ + private static final String EOF = "__EOF__"; + + /** + * Factory method that will create the most appropriate form from the string representation. + * + * @param opaqueValue the opaque value + * @return a new state string + */ + public static StateString create(String opaqueValue) + { + if (opaqueValue == null) + { + throw new IllegalArgumentException(); + } + if (opaqueValue.startsWith(JBPNS_PREFIX)) + { + return new ParametersStateString(opaqueValue); + } + else + { + return new OpaqueStateString(opaqueValue); + } + } + + /** + * Create a parameters state string. It assumes that the argument is either an instance of + * <code>ParametersStateString</code> or that it is the string encoded value of a + * <code>ParametersStateString</code>. + * + * @param stateString the state string + * @return a new state string + * @throws IllegalArgumentException if the state string is opaque and does not represent parameters + */ + public static ParametersStateString create(StateString stateString) throws IllegalArgumentException + { + if (stateString instanceof ParametersStateString) + { + return (ParametersStateString)stateString; + } + else + { + return new ParametersStateString(stateString.getStringValue()); + } + } + + /** The data. */ + private ParameterMap parameters; + + public ParametersStateString(String opaqueValue) + { + if (opaqueValue == null) + { + throw new IllegalArgumentException("No navigational state provided"); + } + if (!opaqueValue.startsWith(JBPNS_PREFIX)) + { + throw new IllegalArgumentException("Bad format"); + } + opaqueValue = opaqueValue.substring(JBPNS_PREFIX.length()); + if (opaqueValue.length() > 0) + { + try + { + byte[] bytes = Base64.decode(opaqueValue, true); + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + ObjectInputStream ois = new ObjectInputStream(bais); + Map<String, String[]> params = new HashMap<String, String[]>(); + + // + String[] values; + + // read the first String which should be a param name + String current = ois.readUTF(); + + // keep reading until we haven't reached the EOF marker + while (!EOF.equals(current)) + { + // next is the size of the value array + int length = ois.readInt(); + values = new String[length]; + + // read as many Strings as are supposed to be in the array + for (int i = 0; i < length; i++) + { + values[i] = ois.readUTF(); + } + + // we're done for this param, add it to the param map + params.put(current, values); + + // read the next string to loop + current = ois.readUTF(); + } + + parameters = ParameterMap.clone(params); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + else + { + parameters = new ParameterMap(); + } + } + + /** Creates an empty parameter set. */ + public ParametersStateString() + { + this.parameters = new ParameterMap(); + } + + /** + * Copy the parameter map to initialize the object state. + * + * @param parameterMap the parameter map to clone + * @throws IllegalArgumentException if the parameter map is null or not valid + */ + public ParametersStateString(Map<String, String[]> parameterMap) + { + this.parameters = ParameterMap.clone(parameterMap); + } + + /** + * Copy the parameter map to initialize the object state. + * + * @param parameterMap the parameter map to clone + * @throws IllegalArgumentException if the parameter map is null or not valid + */ + public ParametersStateString(ParameterMap parameterMap) + { + this.parameters = ParameterMap.clone(parameterMap); + } + + /** + * Return the parameter value or null if it does not exist. + * + * @param name the parameter name + * @return the parameter value or null if it does not exist + * @throws IllegalArgumentException if the name is null + */ + public String getValue(String name) throws IllegalArgumentException + { + return parameters.getValue(name); + } + + /** + * Return the parameter values or null if it does not exist. + * + * @param name the value to get + * @return the parameter values + * @throws IllegalArgumentException if the name is null + */ + public String[] getValues(String name) throws IllegalArgumentException + { + return parameters.getValues(name); + } + + /** Clear all the parameters. */ + public void clear() + { + parameters.clear(); + } + + /** + * Replace all the parameters. + * + * @param map the map to replace + * @throws IllegalArgumentException if the map is not valid + */ + public void replace(Map<String, String[]> map) + { + this.parameters.replace(map); + } + + /** + * Set the a parameter value. + * + * @param name the parameter name + * @param value the parameter value + * @throws IllegalArgumentException if the name or the value is null + */ + public void setValue(String name, String value) + { + parameters.setValue(name, value); + } + + /** + * Set the parameter values. This method does not make a defensive copy of the values. + * + * @param name the parameter name + * @param values the parameter values + * @throws IllegalArgumentException if the name is null + */ + public void setValues(String name, String[] values) + { + parameters.setValues(name, values); + } + + /** + * Remove a parameter. + * + * @param name the parameter name + * @throws IllegalArgumentException if the name is null + */ + public void remove(String name) + { + parameters.remove(name); + } + + /** + * Return the size. + * + * @return the size + */ + public int getSize() + { + return parameters.size(); + } + + /** + * Return the underlying parameter object. + * + * @return the parameter object + */ + public ParameterMap getParameters() + { + return parameters; + } + + /** + * Retrieves the opaque version associated with this navigational state. + * + * @return a URL-safe String representation of this navigational state. + */ + public String getStringValue() + { + if (parameters != null && parameters.size() != 0) + { + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + for (Map.Entry entry : parameters.entrySet()) + { + String name = (String)entry.getKey(); + oos.writeUTF(name); + String[] values = (String[])entry.getValue(); + int length = values.length; + oos.writeInt(length); + for (String value : values) + { + oos.writeUTF(value); + } + } + oos.writeUTF(EOF); + oos.close(); + byte[] bytes = baos.toByteArray(); + return JBPNS_PREFIX + Base64.encodeBytes(bytes, true); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + else + { + return JBPNS_PREFIX; + } + } + + public int hashCode() + { + return getParameters().hashCode(); + } + + public boolean equals(Object o) + { + if (o == this) + { + return true; + } + if (o instanceof ParametersStateString) + { + ParametersStateString that = (ParametersStateString)o; + return that.parameters.equals(parameters); + } + return false; + } + + public String toString() + { + return "StateString[" + parameters + "]"; + } +} Property changes on: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java ___________________________________________________________________ Name: svn:executable + Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -1,333 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.Base64; -import org.jboss.portal.common.util.ParameterMap; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -/** - * A set of parameters. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6549 $ - */ -public class PortletParametersStateString extends StateString implements Serializable -{ - /** . */ - public static final String JBPNS_PREFIX = "JBPNS_"; - - /** The serialVersionUID */ - private static final long serialVersionUID = -8529807471117491810L; - - /** . */ - private static final String EOF = "__EOF__"; - - /** The data. */ - private ParameterMap parameters; - - /** - * Factory method that will create the most appropriate form. - * - * @param opaqueValue the opaque value - * @return a new state string - */ - public static StateString create(String opaqueValue) - { - if (opaqueValue == null) - { - throw new IllegalArgumentException(); - } - if (opaqueValue.startsWith(JBPNS_PREFIX)) - { - return new PortletParametersStateString(opaqueValue); - } - else - { - return new OpaqueStateString(opaqueValue); - } - } - - public static PortletParametersStateString create(StateString stateString) - { - if (stateString instanceof PortletParametersStateString) - { - return (PortletParametersStateString)stateString; - } - else - { - return new PortletParametersStateString(stateString.getStringValue()); - } - } - - public static PortletParametersStateString create(Map<String, String[]> parameterMap) - { - ParameterMap params = ParameterMap.wrap(parameterMap); - return new PortletParametersStateString(params); - } - - public PortletParametersStateString(String opaqueValue) - { - if (opaqueValue == null) - { - throw new IllegalArgumentException("No navigational state provided"); - } - if (!opaqueValue.startsWith(JBPNS_PREFIX)) - { - throw new IllegalArgumentException("Bad format"); - } - opaqueValue = opaqueValue.substring(JBPNS_PREFIX.length()); - if (opaqueValue.length() > 0) - { - try - { - byte[] bytes = Base64.decode(opaqueValue, true); - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - ObjectInputStream ois = new ObjectInputStream(bais); - Map<String, String[]> params = new HashMap<String, String[]>(); - - // - String[] values; - - // read the first String which should be a param name - String current = ois.readUTF(); - - // keep reading until we haven't reached the EOF marker - while (!EOF.equals(current)) - { - // next is the size of the value array - int length = ois.readInt(); - values = new String[length]; - - // read as many Strings as are supposed to be in the array - for (int i = 0; i < length; i++) - { - values[i] = ois.readUTF(); - } - - // we're done for this param, add it to the param map - params.put(current, values); - - // read the next string to loop - current = ois.readUTF(); - } - - parameters = ParameterMap.clone(params); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - else - { - parameters = new ParameterMap(); - } - } - - /** Creates an empty parameter set. */ - public PortletParametersStateString() - { - this.parameters = new ParameterMap(); - } - - /** - * Copy the parameter map to initialize the object state. - * - * @param parameterMap the parameter map to clone - * @throws IllegalArgumentException if the parameter map is null or not valid - */ - public PortletParametersStateString(ParameterMap parameterMap) - { - this.parameters = ParameterMap.clone(parameterMap); - } - - /** - * Return the parameter value or null if it does not exist. - * - * @param name the parameter name - * @return the parameter value or null if it does not exist - * @throws IllegalArgumentException if the name is null - */ - public String getValue(String name) throws IllegalArgumentException - { - return parameters.getValue(name); - } - - /** - * Return the parameter values or null if it does not exist. - * - * @param name the value to get - * @return the parameter values - * @throws IllegalArgumentException if the name is null - */ - public String[] getValues(String name) throws IllegalArgumentException - { - return parameters.getValues(name); - } - - /** Clear all the parameters. */ - public void clear() - { - parameters.clear(); - } - - /** - * Replace all the parameters. - * - * @param map the map to replace - * @throws IllegalArgumentException if the map is not valid - */ - public void replace(Map<String, String[]> map) - { - this.parameters.replace(map); - } - - /** - * Set the a parameter value. - * - * @param name the parameter name - * @param value the parameter value - * @throws IllegalArgumentException if the name or the value is null - */ - public void setValue(String name, String value) - { - parameters.setValue(name, value); - } - - /** - * Set the parameter values. This method does not make a defensive copy of the values. - * - * @param name the parameter name - * @param values the parameter values - * @throws IllegalArgumentException if the name is null - */ - public void setValues(String name, String[] values) - { - parameters.setValues(name, values); - } - - /** - * Remove a parameter. - * - * @param name the parameter name - * @throws IllegalArgumentException if the name is null - */ - public void remove(String name) - { - parameters.remove(name); - } - - /** - * Return the size. - * - * @return the size - */ - public int getSize() - { - return parameters.size(); - } - - /** - * Return the underlying parameter object. - * - * @return the parameter object - */ - public ParameterMap getParameters() - { - return parameters; - } - - /** - * Retrieves the opaque version associated with this navigational state. - * - * @return a URL-safe String representation of this navigational state. - */ - public String getStringValue() - { - if (parameters != null && parameters.size() != 0) - { - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(baos); - for (Map.Entry entry : parameters.entrySet()) - { - String name = (String)entry.getKey(); - oos.writeUTF(name); - String[] values = (String[])entry.getValue(); - int length = values.length; - oos.writeInt(length); - for (String value : values) - { - oos.writeUTF(value); - } - } - oos.writeUTF(EOF); - oos.close(); - byte[] bytes = baos.toByteArray(); - return JBPNS_PREFIX + Base64.encodeBytes(bytes, true); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - else - { - return JBPNS_PREFIX; - } - } - - public int hashCode() - { - return getParameters().hashCode(); - } - - public boolean equals(Object o) - { - if (o == this) - { - return true; - } - if (o instanceof PortletParametersStateString) - { - PortletParametersStateString that = (PortletParametersStateString)o; - return that.parameters.equals(parameters); - } - return false; - } - - public String toString() - { - return "StateString[" + parameters + "]"; - } -} 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-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -30,7 +30,7 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.spi.RenderContext; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.invocation.AttributeResolver; @@ -89,17 +89,17 @@ { useEntry = true; } - else if (entryNavState instanceof PortletParametersStateString) + else if (entryNavState instanceof ParametersStateString) { // We consider a parameters state string empty equivalent to a null value - useEntry = ((PortletParametersStateString)entryNavState).getSize() == 0; + useEntry = ((ParametersStateString)entryNavState).getSize() == 0; } } else if (entryNavState == null) { - if (navState instanceof PortletParametersStateString) + if (navState instanceof ParametersStateString) { - useEntry = ((PortletParametersStateString)navState).getSize() == 0; + useEntry = ((ParametersStateString)navState).getSize() == 0; } } else Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -26,7 +26,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.OpaqueStateString; import java.util.Iterator; @@ -170,7 +170,7 @@ if (!opaque) { // Compute the parameters skipping the portlet navigational state that may be encoded as well - PortletParametersStateString query = new PortletParametersStateString(); + ParametersStateString query = new ParametersStateString(); for (Iterator i = queryParams.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -26,7 +26,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.RenderURL; import org.jboss.portal.portlet.ActionURL; @@ -100,7 +100,7 @@ // if (interactionState != null) { - if (interactionState instanceof PortletParametersStateString) + if (interactionState instanceof ParametersStateString) { if (navigationalState != null) { @@ -108,7 +108,7 @@ } // Add the parameters - ParameterMap parameters = ((PortletParametersStateString)interactionState).getParameters(); + ParameterMap parameters = ((ParametersStateString)interactionState).getParameters(); configure(parameters); } else @@ -143,10 +143,10 @@ int meta = PortletRequestDecoder.RENDER_MASK; // - if (navigationalState instanceof PortletParametersStateString) + if (navigationalState instanceof ParametersStateString) { // Add the parameters - ParameterMap parameters = ((PortletParametersStateString)navigationalState).getParameters(); + ParameterMap parameters = ((ParametersStateString)navigationalState).getParameters(); configure(parameters); } else Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; /** * The main responsibility of this class is to combine the different parameter sources (private navigational state, @@ -63,14 +63,14 @@ if (interactionState != null) { // Unserialize the interaction state if necessary - PortletParametersStateString parametersState; - if (interactionState instanceof PortletParametersStateString) + ParametersStateString parametersState; + if (interactionState instanceof ParametersStateString) { - parametersState = (PortletParametersStateString)interactionState; + parametersState = (ParametersStateString)interactionState; } else { - parametersState = new PortletParametersStateString(interactionState.getStringValue()); + parametersState = new ParametersStateString(interactionState.getStringValue()); } // @@ -140,7 +140,7 @@ } else { - privateParameters = PortletParametersStateString.create(navigationalState).getParameters(); + privateParameters = ParametersStateString.create(navigationalState).getParameters(); } // Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; @@ -47,7 +47,7 @@ // UpdateNavigationalStateResponse rr = new UpdateNavigationalStateResponse(); - rr.setNavigationalState(new PortletParametersStateString()); + rr.setNavigationalState(new ParametersStateString()); // this.response = rr; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.RenderURL; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -163,7 +163,7 @@ { /** . */ - private PortletParametersStateString parameters = new PortletParametersStateString(); + private ParametersStateString parameters = new ParametersStateString(); protected ParameterMap getInternalParameters() { @@ -186,7 +186,7 @@ { /** . */ - private PortletParametersStateString navigationalState = new PortletParametersStateString(); + private ParametersStateString navigationalState = new ParametersStateString(); protected ParameterMap getInternalParameters() { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import javax.portlet.EventResponse; import javax.portlet.EventRequest; @@ -58,7 +58,7 @@ WantUpdate update = (WantUpdate)decision; update.mode = context.getMode(); update.windowState = context.getWindowState(); - update.navigationalState = PortletParametersStateString.create(context.getNavigationalState()).getParameters(); + update.navigationalState = ParametersStateString.create(context.getNavigationalState()).getParameters(); update.publicNavigationalState = context.getPublicNavigationalState(); } } 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-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.invocation.response.StateResponse; import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.info.ContainerEventingInfo; @@ -390,7 +390,7 @@ response.setMode(mode); response.setWindowState(windowState); response.setPublicNavigationalState(publicNavigationalState); - response.setNavigationalState(new PortletParametersStateString(navigationalState)); + response.setNavigationalState(new ParametersStateString(navigationalState)); // return response; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -26,7 +26,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.impl.PortletRequestDecoder; import org.jboss.unit.api.pojo.annotations.Test; @@ -265,7 +265,7 @@ o.decode(queryParams, null); assertNull(o.getForm()); assertNull(o.getInteractionState()); - assertEquals(new PortletParametersStateString(), o.getNavigationalState()); + assertEquals(new ParametersStateString(), o.getNavigationalState()); assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); assertNull(o.getMode()); assertNull(o.getWindowState()); @@ -277,7 +277,7 @@ o.decode(queryParams, null); assertNull(o.getForm()); assertNull(o.getInteractionState()); - assertEquals(new PortletParametersStateString(), o.getNavigationalState()); + assertEquals(new ParametersStateString(), o.getNavigationalState()); assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); assertEquals(Mode.VIEW, o.getMode()); assertNull(o.getWindowState()); @@ -289,7 +289,7 @@ o.decode(queryParams, null); assertNull(o.getForm()); assertNull(o.getInteractionState()); - assertEquals(new PortletParametersStateString(), o.getNavigationalState()); + assertEquals(new ParametersStateString(), o.getNavigationalState()); assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); assertNull(o.getMode()); assertEquals(WindowState.NORMAL, o.getWindowState()); @@ -302,7 +302,7 @@ Map queryParams = new HashMap(); Map bodyParams = new HashMap(); PortletRequestDecoder o = new PortletRequestDecoder(); - PortletParametersStateString navState = new PortletParametersStateString(); + ParametersStateString navState = new ParametersStateString(); // Query parameter queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); @@ -511,7 +511,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); o.decode(queryParams, null); assertEquals(new ParameterMap(), o.getForm()); - assertEquals(new PortletParametersStateString(), o.getInteractionState()); + assertEquals(new ParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); assertNull(o.getMode()); @@ -523,7 +523,7 @@ queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, null); assertEquals(new ParameterMap(), o.getForm()); - assertEquals(new PortletParametersStateString(), o.getInteractionState()); + assertEquals(new ParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); assertEquals(Mode.VIEW, o.getMode()); @@ -535,7 +535,7 @@ queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, null); assertEquals(new ParameterMap(), o.getForm()); - assertEquals(new PortletParametersStateString(), o.getInteractionState()); + assertEquals(new ParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); assertNull(o.getMode()); @@ -549,7 +549,7 @@ Map queryParams = new HashMap(); Map bodyParams = new HashMap(); PortletRequestDecoder o = new PortletRequestDecoder(); - PortletParametersStateString intState = new PortletParametersStateString(); + ParametersStateString intState = new ParametersStateString(); ParameterMap form = new ParameterMap(); // Query parameter Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.impl.PortletRequestEncoder; import org.jboss.portal.portlet.impl.PortletRequestDecoder; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -81,20 +81,20 @@ public void _testEncodeRender(int lifecycle, int lifecycleMask) { - PortletParametersStateString pp = new PortletParametersStateString(); + ParametersStateString pp = new ParametersStateString(); encode(pp, null, null, lifecycle); assertEquals(1, params.size()); _assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue(PortletRequestDecoder.META_PARAMETER, "foo"); encode(pp, null, null, lifecycle); assertEquals(1, params.size()); _assertEquals(new String[]{Integer.toHexString(lifecycleMask),"foo"}, params.getValues(PortletRequestDecoder.META_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue("foo", "bar"); encode(pp, null, null, lifecycle); assertEquals(2, params.size()); @@ -102,14 +102,14 @@ _assertEquals("bar", params.getValues("foo")); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(2, params.size()); _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue(PortletRequestDecoder.MODE_PARAMETER, "foo"); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(2, params.size()); @@ -117,7 +117,7 @@ _assertEquals(new String[]{Mode.VIEW.toString(),"foo"}, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue("foo", "bar"); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(3, params.size()); @@ -126,14 +126,14 @@ _assertEquals("bar", params.getValues("foo")); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(2, params.size()); _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "foo"); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(2, params.size()); @@ -141,7 +141,7 @@ _assertEquals(new String[]{WindowState.NORMAL.toString(),"foo"}, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue("foo", "bar"); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(3, params.size()); @@ -150,7 +150,7 @@ _assertEquals("bar", params.getValues("foo")); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); assertEquals(3, params.size()); _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); @@ -158,7 +158,7 @@ _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // - pp = new PortletParametersStateString(); + pp = new ParametersStateString(); pp.setValue("foo", "bar"); encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); assertEquals(4, params.size()); @@ -191,7 +191,7 @@ _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); } - private void encode(PortletParametersStateString params, Mode view, WindowState normal, int lifecycle) + private void encode(ParametersStateString params, Mode view, WindowState normal, int lifecycle) { if (lifecycle == RENDER) { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -23,7 +23,7 @@ package org.jboss.portal.test.portlet.navigation; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.unit.api.pojo.annotations.Test; import static org.jboss.unit.api.Assert.*; @@ -43,7 +43,7 @@ @Test public void testNavigationalState() throws Exception { - PortletParametersStateString ns = new PortletParametersStateString(); + ParametersStateString ns = new ParametersStateString(); ns.setValue(NAME1, VALUE1); assertEquals(VALUE1, ns.getValue(NAME1)); @@ -51,7 +51,7 @@ System.out.println("opaqueValue = " + opaqueValue); assertNotNull(opaqueValue); - ns = new PortletParametersStateString(opaqueValue); + ns = new ParametersStateString(opaqueValue); assertEquals(VALUE1, ns.getValue(NAME1)); } } 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-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.EventInfo; @@ -114,7 +114,7 @@ UpdateNavigationalStateResponse updateNavigationalState = new UpdateNavigationalStateResponse(); updateNavigationalState.setMode(action.mode); updateNavigationalState.setWindowState(action.windowState); - updateNavigationalState.setNavigationalState(PortletParametersStateString.create(action.queryParameters)); + updateNavigationalState.setNavigationalState(new ParametersStateString(action.queryParameters)); return updateNavigationalState; } else @@ -167,7 +167,7 @@ portletNS, publicNS, MARKUP_INFO, - PortletParametersStateString.create(action.queryParameters), + new ParametersStateString(action.queryParameters), action.bodyParameters != null ? ParameterMap.clone(action.bodyParameters) : null); ActionInvocation actionInvocation = new ActionInvocation(actionContext); 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-01-15 23:40:57 UTC (rev 9519) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-01-15 23:52:11 UTC (rev 9520) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.test.url.CodecBuilder; import org.jboss.portal.portlet.test.url.ParameterEncoder; @@ -117,11 +117,11 @@ ParameterMap actualParameters; if (portletURL instanceof RenderURL) { - actualParameters = ((PortletParametersStateString)((RenderURL)portletURL).getNavigationalState()).getParameters(); + actualParameters = ((ParametersStateString)((RenderURL)portletURL).getNavigationalState()).getParameters(); } else { - actualParameters = ((PortletParametersStateString)((ActionURL)portletURL).getInteractionState()).getParameters(); + actualParameters = ((ParametersStateString)((ActionURL)portletURL).getInteractionState()).getParameters(); } //