Updated Branches: refs/heads/master 569c1889e -> 34bdc2dee
WICKET-4787: do not rely on requestcycle in tostring Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/34bdc2de Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/34bdc2de Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/34bdc2de Branch: refs/heads/master Commit: 34bdc2dee5603f178fd8112ec859b4e61f5b44f8 Parents: 569c188 Author: Emond Papegaaij <[email protected]> Authored: Fri Sep 28 08:00:51 2012 +0200 Committer: Emond Papegaaij <[email protected]> Committed: Fri Sep 28 08:04:34 2012 +0200 ---------------------------------------------------------------------- .../wicket/markup/head/CssReferenceHeaderItem.java | 2 +- .../markup/head/CssUrlReferenceHeaderItem.java | 2 +- .../markup/head/JavaScriptReferenceHeaderItem.java | 5 +++-- .../head/JavaScriptUrlReferenceHeaderItem.java | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/34bdc2de/wicket-core/src/main/java/org/apache/wicket/markup/head/CssReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssReferenceHeaderItem.java index 732a7df..81cde69 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssReferenceHeaderItem.java @@ -114,7 +114,7 @@ public class CssReferenceHeaderItem extends CssHeaderItem implements IReferenceH @Override public String toString() { - return "CSSReferenceHeaderItem(" + getUrl() + ")"; + return "CSSReferenceHeaderItem(" + getReference() + ", " + getPageParameters() + ")"; } private String getUrl() http://git-wip-us.apache.org/repos/asf/wicket/blob/34bdc2de/wicket-core/src/main/java/org/apache/wicket/markup/head/CssUrlReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssUrlReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssUrlReferenceHeaderItem.java index 08c809c..0421668 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssUrlReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssUrlReferenceHeaderItem.java @@ -19,8 +19,8 @@ package org.apache.wicket.markup.head; import java.util.Arrays; import org.apache.wicket.request.Response; +import org.apache.wicket.request.UrlUtils; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.core.util.string.UrlUtils; /** * {@link HeaderItem} for style tags that are rendered using a fixed URL, for example resources from http://git-wip-us.apache.org/repos/asf/wicket/blob/34bdc2de/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java index bbeae59..69c5bbe 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java @@ -132,7 +132,8 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem @Override public void render(Response response) { - internalRenderJavaScriptReference(response, getUrl(), getId(), isDefer(), getCharset(), getCondition()); + internalRenderJavaScriptReference(response, getUrl(), getId(), isDefer(), getCharset(), + getCondition()); } @Override @@ -148,7 +149,7 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem @Override public String toString() { - return "JavaScriptReferenceHeaderItem(" + getUrl() + ')'; + return "JavaScriptReferenceHeaderItem(" + getReference() + ", " + getPageParameters() + ')'; } private String getUrl() http://git-wip-us.apache.org/repos/asf/wicket/blob/34bdc2de/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem.java index 6d6f328..e8801c5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptUrlReferenceHeaderItem.java @@ -20,9 +20,9 @@ import java.util.Arrays; import java.util.Collections; import org.apache.wicket.request.Response; +import org.apache.wicket.request.UrlUtils; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.util.string.Strings; -import org.apache.wicket.core.util.string.UrlUtils; /** * {@link HeaderItem} for script tags that are rendered using a fixed URL, for example resources @@ -53,7 +53,8 @@ public class JavaScriptUrlReferenceHeaderItem extends JavaScriptHeaderItem * @param condition * the condition to use for Internet Explorer conditional comments. E.g. "IE 7". */ - public JavaScriptUrlReferenceHeaderItem(String url, String id, boolean defer, String charset, String condition) + public JavaScriptUrlReferenceHeaderItem(String url, String id, boolean defer, String charset, + String condition) { super(condition); this.url = url;
