You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/06/25 14:14:03 UTC
[3/4] git commit: WICKET-4627 Change Url#parse() methods to accept
CharSequence instead of String
WICKET-4627 Change Url#parse() methods to accept CharSequence instead of String
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/09f0896a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/09f0896a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/09f0896a
Branch: refs/heads/master
Commit: 09f0896a60d041214a5c3c1eb5ed0bccbe8f1f7d
Parents: 8f6f59e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 25 15:08:51 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 25 15:09:55 2012 +0300
----------------------------------------------------------------------
.../main/java/org/apache/wicket/request/Url.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/09f0896a/wicket-request/src/main/java/org/apache/wicket/request/Url.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
index 74c9324..5f92172 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
@@ -179,7 +179,7 @@ public class Url implements Serializable
* absolute or relative url with query string
* @return Url object
*/
- public static Url parse(final String url)
+ public static Url parse(final CharSequence url)
{
return parse(url, null);
}
@@ -187,20 +187,21 @@ public class Url implements Serializable
/**
* Parses the given URL string.
*
- * @param url
+ * @param _url
* absolute or relative url with query string
* @param charset
* @return Url object
*/
- public static Url parse(String url, Charset charset)
+ public static Url parse(CharSequence _url, Charset charset)
{
- Args.notNull(url, "url");
+ Args.notNull(_url, "_url");
final Url result = new Url(charset);
// the url object resolved the charset, use that
charset = result.getCharset();
+ String url = _url.toString();
// extract query string part
final String queryString;
final String absoluteUrl;