svn commit: r1081216 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java

[mg...@apache.org]

Author: mgrigorov
Date: Sun Mar 13 20:38:08 2011
New Revision: 1081216

URL: http://svn.apache.org/viewvc?rev=1081216&view=rev
Log:
WICKET-3456 Would like a renderCSS method in IHeaderResponse

Simplify code - chain methods. The real logic is left in the method with the most parameters.


Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=1081216&r1=1081215&r2=1081216&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Sun Mar 13 20:38:08 2011
@@ -31,6 +31,7 @@ import org.apache.wicket.request.handler
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.response.NullResponse;
+import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.string.JavaScriptUtils;
 import org.apache.wicket.util.string.Strings;
 
@@ -60,16 +61,7 @@ public abstract class HeaderResponse imp
 	 */
 	public void renderCSSReference(ResourceReference reference)
 	{
-		if (reference == null)
-		{
-			throw new IllegalArgumentException("reference cannot be null");
-		}
-		if (!closed)
-		{
-			IRequestHandler handler = new ResourceReferenceRequestHandler(reference);
-			CharSequence url = RequestCycle.get().urlFor(handler);
-			internalRenderCSSReference(url.toString(), null);
-		}
+		renderCSSReference(reference, null, null);
 	}
 
 	/**
@@ -101,14 +93,7 @@ public abstract class HeaderResponse imp
 	 */
 	public void renderCSSReference(String url)
 	{
-		if (Strings.isEmpty(url))
-		{
-			throw new IllegalArgumentException("url cannot be empty or null");
-		}
-		if (!closed)
-		{
-			internalRenderCSSReference(relative(url), null);
-		}
+		renderCSSReference(url, null);
 	}
 
 	/**
@@ -153,16 +138,7 @@ public abstract class HeaderResponse imp
 	 */
 	public void renderJavaScriptReference(ResourceReference reference)
 	{
-		if (reference == null)
-		{
-			throw new IllegalArgumentException("reference cannot be null");
-		}
-		if (!closed)
-		{
-			IRequestHandler handler = new ResourceReferenceRequestHandler(reference);
-			CharSequence url = RequestCycle.get().urlFor(handler);
-			internalRenderJavaScriptReference(url.toString(), null);
-		}
+		renderJavaScriptReference(reference, null);
 	}
 
 	/**
@@ -177,10 +153,8 @@ public abstract class HeaderResponse imp
 	public void renderJavaScriptReference(ResourceReference reference,
 		PageParameters pageParameters, String id)
 	{
-		if (reference == null)
-		{
-			throw new IllegalArgumentException("reference cannot be null");
-		}
+		Args.notNull(reference, "reference");
+
 		if (!closed)
 		{
 			IRequestHandler handler = new ResourceReferenceRequestHandler(reference, pageParameters);
@@ -238,10 +212,8 @@ public abstract class HeaderResponse imp
 	 */
 	public void renderJavaScript(CharSequence javascript, String id)
 	{
-		if (javascript == null)
-		{
-			throw new IllegalArgumentException("javascript cannot be null");
-		}
+		Args.notNull(javascript, "javascript");
+
 		if (!closed)
 		{
 			List<String> token = Arrays.asList(javascript.toString(), id);
@@ -258,10 +230,8 @@ public abstract class HeaderResponse imp
 	 */
 	public void renderString(CharSequence string)
 	{
-		if (string == null)
-		{
-			throw new IllegalArgumentException("string cannot be null");
-		}
+		Args.notNull(string, "string");
+
 		if (!closed)
 		{
 			String token = string.toString();
@@ -362,6 +332,8 @@ public abstract class HeaderResponse imp
 	 */
 	private String relative(final String location)
 	{
+		Args.notEmpty(location, "location");
+
 		if (location.startsWith("http://") || location.startsWith("https://") ||
 			location.startsWith("/"))
 		{