Author: julien(a)jboss.com Date: 2008-01-15 09:26:15 -0500 (Tue, 15 Jan 2008) New Revision: 9510 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java Log: generified the parameterencoder / parameterdecoder classes Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java 2008-01-15 12:30:39 UTC (rev 9509) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java 2008-01-15 14:26:15 UTC (rev 9510) @@ -33,20 +33,20 @@ { /** . */ - final ArrayList metaParameterNames; + final ArrayList<String> metaParameterNames; /** . */ final String reservedParameterName; public CodecBuilder(CodecBuilder that) { - this.metaParameterNames = new ArrayList(that.metaParameterNames); + this.metaParameterNames = new ArrayList<String>(that.metaParameterNames); this.reservedParameterName = that.reservedParameterName; } public CodecBuilder(String reservedParameter) { - this.metaParameterNames = new ArrayList(); + this.metaParameterNames = new ArrayList<String>(); this.reservedParameterName = reservedParameter; } @@ -73,5 +73,4 @@ { return new ParameterDecoder(this); } - } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java 2008-01-15 12:30:39 UTC (rev 9509) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java 2008-01-15 14:26:15 UTC (rev 9510) @@ -25,8 +25,6 @@ import org.jboss.portal.common.util.ParameterMap; import java.util.Iterator; -import java.util.ArrayList; -import java.util.Collections; import java.util.Map; /** @@ -68,7 +66,7 @@ metaParameters.clear(); // Get the meta parameter - long reservedParameter = 0; + long reservedParameter; String[] reservedParameters = parameters.getValues(builder.reservedParameterName); if (reservedParameters != null) { @@ -99,7 +97,7 @@ } // - String parameterName = (String)builder.metaParameterNames.get(i--); + String parameterName = builder.metaParameterNames.get(i--); // if ((reservedParameter & 1) == 1) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java 2008-01-15 12:30:39 UTC (rev 9509) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java 2008-01-15 14:26:15 UTC (rev 9510) @@ -25,7 +25,6 @@ import org.jboss.portal.common.util.ParameterMap; import java.util.Map; -import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -59,9 +58,8 @@ long meta = 0; // - for (Iterator i = builder.metaParameterNames.iterator();i.hasNext();) + for (String mv : builder.metaParameterNames) { - String mv = (String)i.next(); String pv = metaParameters.getValue(mv); // @@ -91,10 +89,10 @@ String[] pvs = actualParameters.getValues(builder.reservedParameterName); if (pvs != null) { - String[] blah = new String[1 + pvs.length]; - blah[0] = def; - System.arraycopy(pvs, 0, blah, 1, pvs.length); - parameters.setValues(builder.reservedParameterName, blah); + String[] tmp = new String[1 + pvs.length]; + tmp[0] = def; + System.arraycopy(pvs, 0, tmp, 1, pvs.length); + parameters.setValues(builder.reservedParameterName, tmp); } else { @@ -102,13 +100,12 @@ } // - for (Iterator i = actualParameters.entrySet().iterator();i.hasNext();) + for (Map.Entry<String, String[]> entry : actualParameters.entrySet()) { - Map.Entry entry = (Map.Entry)i.next(); - String name = (String)entry.getKey(); + String name = entry.getKey(); if (!parameters.containsKey(name)) { - String[] values = (String[])entry.getValue(); + String[] values = entry.getValue(); parameters.setValues(name, values); } }