Author: ehillenius
Date: Tue May 29 23:14:34 2007
New Revision: 542764
URL: http://svn.apache.org/viewvc?view=rev&rev=542764
Log:
WICKET-600
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?view=diff&rev=542764&r1=542763&r2=542764
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
Tue May 29 23:14:34 2007
@@ -37,6 +37,7 @@
import org.apache.wicket.request.ClientInfo;
import
org.apache.wicket.request.target.component.BookmarkablePageRequestTarget;
import org.apache.wicket.settings.IRequestCycleSettings;
+import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -502,7 +503,7 @@
*/
public BrowserInfoPage(PageParameters parameters)
{
- String to = (String)parameters.get("cto");
+ String to = Strings.toString(parameters.get("cto"));
if (to == null)
{
throw new IllegalArgumentException("parameter cto must
be provided!");
@@ -600,7 +601,8 @@
// Redirect there
Response response = requestCycle.getResponse();
response.reset();
-
response.redirect(requestCycle.getRequest().getRelativePathPrefixToWicketHandler()
+ continueTo);
+
response.redirect(requestCycle.getRequest().getRelativePathPrefixToWicketHandler()
+ + continueTo);
}
/**
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?view=diff&rev=542764&r1=542763&r2=542764
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
Tue May 29 23:14:34 2007
@@ -1103,7 +1103,10 @@
}
/**
- * Converts the given object to a string.
+ * Converts the given object to a string. Does special conversion for
+ * [EMAIL PROTECTED] Throwable throwables} and String arrays of length
1 (in which case
+ * it just returns to string in that array, as this is a common thing to
+ * have in the Servlet API).
*
* @param object
* The object
@@ -1115,14 +1118,23 @@
{
return null;
}
- else if (object instanceof Throwable)
+
+ if (object instanceof Throwable)
{
return toString((Throwable)object);
}
- else
+
+ if (object instanceof String)
{
- return object.toString();
+ return (String)object;
}
+
+ if (object instanceof String[] && ((String[])object).length ==
1)
+ {
+ return ((String[])object)[0];
+ }
+
+ return object.toString();
}
/**
