Chain the factory methods.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b6db499d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b6db499d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b6db499d Branch: refs/heads/master Commit: b6db499d422c09ca9903b7a90b92e1cde92ce615 Parents: 7ca927c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jan 30 14:52:50 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jan 30 14:52:50 2012 +0200 ---------------------------------------------------------------------- .../apache/wicket/markup/head/CssHeaderItem.java | 17 +++++++-------- .../wicket/markup/head/JavaScriptHeaderItem.java | 14 ++++++------ 2 files changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b6db499d/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java index 6d943ef..4c88a7b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/CssHeaderItem.java @@ -19,6 +19,7 @@ package org.apache.wicket.markup.head; import org.apache.wicket.request.Response; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; /** @@ -38,7 +39,7 @@ public abstract class CssHeaderItem extends HeaderItem */ public static CssReferenceHeaderItem forReference(ResourceReference reference) { - return new CssReferenceHeaderItem(reference, null, null, null); + return forReference(reference, null); } /** @@ -52,7 +53,7 @@ public abstract class CssHeaderItem extends HeaderItem */ public static CssReferenceHeaderItem forReference(ResourceReference reference, String media) { - return new CssReferenceHeaderItem(reference, null, media, null); + return forReference(reference, null, media); } /** @@ -69,7 +70,7 @@ public abstract class CssHeaderItem extends HeaderItem public static CssReferenceHeaderItem forReference(ResourceReference reference, PageParameters pageParameters, String media) { - return new CssReferenceHeaderItem(reference, pageParameters, media, null); + return forReference(reference, pageParameters, media, null); } /** @@ -115,7 +116,7 @@ public abstract class CssHeaderItem extends HeaderItem */ public static CssUrlReferenceHeaderItem forUrl(String url) { - return new CssUrlReferenceHeaderItem(url, null, null); + return forUrl(url, null); } /** @@ -129,7 +130,7 @@ public abstract class CssHeaderItem extends HeaderItem */ public static CssUrlReferenceHeaderItem forUrl(String url, String media) { - return new CssUrlReferenceHeaderItem(url, media, null); + return forUrl(url, media, null); } /** @@ -151,10 +152,8 @@ public abstract class CssHeaderItem extends HeaderItem protected static void internalRenderCSSReference(Response response, String url, String media, String condition) { - if (Strings.isEmpty(url)) - { - throw new IllegalArgumentException("url cannot be empty or null"); - } + Args.notEmpty(url, "url"); + String urlWoSessionId = Strings.stripJSessionId(url); if (Strings.isEmpty(condition) == false) { http://git-wip-us.apache.org/repos/asf/wicket/blob/b6db499d/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java index aaa3d9c..43fa3bd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptHeaderItem.java @@ -40,7 +40,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem */ public static JavaScriptReferenceHeaderItem forReference(ResourceReference reference) { - return new JavaScriptReferenceHeaderItem(reference, null, null, false, null); + return forReference(reference, null); } /** @@ -55,7 +55,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem */ public static JavaScriptReferenceHeaderItem forReference(ResourceReference reference, String id) { - return new JavaScriptReferenceHeaderItem(reference, null, id, false, null); + return forReference(reference, null, id); } /** @@ -73,7 +73,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem public static JavaScriptReferenceHeaderItem forReference(ResourceReference reference, PageParameters pageParameters, String id) { - return new JavaScriptReferenceHeaderItem(reference, pageParameters, id, false, null); + return forReference(reference, pageParameters, id, false); } /** @@ -94,7 +94,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem public static JavaScriptReferenceHeaderItem forReference(ResourceReference reference, PageParameters pageParameters, String id, boolean defer) { - return new JavaScriptReferenceHeaderItem(reference, pageParameters, id, defer, null); + return forReference(reference, pageParameters, id, defer, null); } /** @@ -144,7 +144,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem */ public static JavaScriptUrlReferenceHeaderItem forUrl(String url) { - return new JavaScriptUrlReferenceHeaderItem(url, null, false, null); + return forUrl(url, null); } /** @@ -159,7 +159,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem */ public static JavaScriptUrlReferenceHeaderItem forUrl(String url, String id) { - return new JavaScriptUrlReferenceHeaderItem(url, id, false, null); + return forUrl(url, id, false); } /** @@ -177,7 +177,7 @@ public abstract class JavaScriptHeaderItem extends HeaderItem */ public static JavaScriptUrlReferenceHeaderItem forUrl(String url, String id, boolean defer) { - return new JavaScriptUrlReferenceHeaderItem(url, id, defer, null); + return forUrl(url, id, defer, null); } /**
