You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/05/22 18:28:07 UTC

svn commit: r540640 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java

Author: almaw
Date: Tue May 22 09:28:06 2007
New Revision: 540640

URL: http://svn.apache.org/viewvc?view=rev&rev=540640
Log:
Refactor appendingParams code slightly.

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java?view=diff&rev=540640&r1=540639&r2=540640
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java Tue May 22 09:28:06 2007
@@ -117,25 +117,29 @@
 				Object value = entry.getValue();
 				if (value != null)
 				{
-					if (value instanceof String[]) {
+					if (value instanceof String[])
+					{
 						String[] values = (String[])value;
-						for (int i = 0; i < values.length; i++) {
-							String escapedValue = urlEncode(values[i]);
-							if (!Strings.isEmpty(escapedValue))
-							{
-								url.append("/").append(entry.getKey()).append("/").append(escapedValue);
-							}
-						}
-					}
-					else {
-						String escapedValue = urlEncode(value.toString());
-						if (!Strings.isEmpty(escapedValue))
+						for (int i = 0; i < values.length; i++)
 						{
-							url.append("/").append(entry.getKey()).append("/").append(escapedValue);
+							appendValue(url, entry.getKey().toString(), values[i]);
 						}
 					}
+					else
+					{
+						appendValue(url, entry.getKey().toString(), value.toString());
+					}
 				}
 			}
+		}
+	}
+	
+	private void appendValue(AppendingStringBuffer url, String key, String value)
+	{
+		String escapedValue = urlEncode(value);
+		if (!Strings.isEmpty(escapedValue))
+		{
+			url.append("/").append(key).append("/").append(escapedValue);
 		}
 	}