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/11/02 18:00:10 UTC
git commit: Use the non-deprecated version of UrlUtils
Updated Branches:
refs/heads/master 62a6f97ca -> 146fae288
Use the non-deprecated version of UrlUtils
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/146fae28
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/146fae28
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/146fae28
Branch: refs/heads/master
Commit: 146fae28830b2ad8dce9beb3371c0c9c37d4dd8d
Parents: 62a6f97
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Nov 2 18:59:35 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 2 18:59:35 2012 +0200
----------------------------------------------------------------------
.../markup/html/image/ContextPathGenerator.java | 2 +-
.../apache/wicket/markup/html/include/Include.java | 4 ++--
.../wicket/markup/html/link/ExternalLink.java | 2 +-
.../org/apache/wicket/mock/MockWebRequest.java | 2 +-
.../protocol/http/servlet/ServletWebRequest.java | 2 +-
.../request/resource/UrlResourceReference.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
index 8a3efa6..90f2f7b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
@@ -21,8 +21,8 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.core.util.string.UrlUtils;
/**
* A behavior that converts the provider url fragment to a context-relative url. For example if the
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
index e80b566..df90241 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
@@ -23,14 +23,14 @@ import java.nio.charset.Charset;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.resource.ResourceUtil;
-import org.apache.wicket.core.util.resource.UrlResourceStream;
-import org.apache.wicket.core.util.string.UrlUtils;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
index 2ebbef1..6e733c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
@@ -20,9 +20,9 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.core.util.string.UrlUtils;
/**
* <p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
index e736441..61e95c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
@@ -29,8 +29,8 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.core.util.string.UrlUtils;
import org.apache.wicket.util.time.Time;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
index 9de1381..02ffe67 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
@@ -35,6 +35,7 @@ import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.IWritableRequestParameters;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Bytes;
@@ -42,7 +43,6 @@ import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.core.util.string.UrlUtils;
import org.apache.wicket.util.time.Time;
import org.apache.wicket.util.upload.FileItemFactory;
import org.apache.wicket.util.upload.FileUploadException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/146fae28/wicket-core/src/main/java/org/apache/wicket/request/resource/UrlResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/UrlResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/UrlResourceReference.java
index 8a5592a..ce5775f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/UrlResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/UrlResourceReference.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.resource;
-import org.apache.wicket.core.util.string.UrlUtils;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.UrlUtils;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Args;