Author: ivaynberg
Date: Sat Mar 8 11:20:47 2008
New Revision: 635053
URL: http://svn.apache.org/viewvc?rev=635053&view=rev
Log:
WICKET-1396: Add more explicit exception for NPE in HeaderResponse.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=635053&r1=635052&r2=635053&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
Sat Mar 8 11:20:47 2008
@@ -29,6 +29,7 @@
import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.response.NullResponse;
import org.apache.wicket.util.string.JavascriptUtils;
+import org.apache.wicket.util.string.Strings;
/**
@@ -69,6 +70,10 @@
*/
public void renderCSSReference(ResourceReference reference)
{
+ if (reference == null)
+ {
+ throw new IllegalArgumentException("reference cannot be
null");
+ }
if (!closed)
{
CharSequence url = RequestCycle.get().urlFor(reference);
@@ -82,6 +87,10 @@
*/
public void renderCSSReference(ResourceReference reference, String
media)
{
+ if (reference == null)
+ {
+ throw new IllegalArgumentException("reference cannot be
null");
+ }
if (!closed)
{
CharSequence url = RequestCycle.get().urlFor(reference);
@@ -94,6 +103,10 @@
*/
public void renderCSSReference(String url)
{
+ if (Strings.isEmpty(url))
+ {
+ throw new IllegalArgumentException("url cannot be empty
or null");
+ }
if (!closed)
{
renderCSSReference(url, null);
@@ -106,6 +119,10 @@
*/
public void renderCSSReference(String url, String media)
{
+ if (Strings.isEmpty(url))
+ {
+ throw new IllegalArgumentException("url cannot be empty
or null");
+ }
if (!closed)
{
List token = Arrays.asList(new Object[] { "css", url,
media });
@@ -131,6 +148,10 @@
*/
public void renderJavascriptReference(ResourceReference reference)
{
+ if (reference == null)
+ {
+ throw new IllegalArgumentException("reference cannot be
null");
+ }
if (!closed)
{
CharSequence url = RequestCycle.get().urlFor(reference);
@@ -144,6 +165,10 @@
*/
public void renderJavascriptReference(ResourceReference reference,
String id)
{
+ if (reference == null)
+ {
+ throw new IllegalArgumentException("reference cannot be
null");
+ }
if (!closed)
{
CharSequence url = RequestCycle.get().urlFor(reference);
@@ -156,6 +181,10 @@
*/
public void renderJavascriptReference(String url)
{
+ if (Strings.isEmpty(url))
+ {
+ throw new IllegalArgumentException("url cannot be empty
or null");
+ }
if (!closed)
{
List token = Arrays.asList(new Object[] { "javascript",
url });
@@ -173,6 +202,10 @@
*/
public void renderJavascriptReference(String url, String id)
{
+ if (Strings.isEmpty(url))
+ {
+ throw new IllegalArgumentException("url cannot be empty
or null");
+ }
if (!closed)
{
List token1 = Arrays.asList(new Object[] {
"javascript", url });
@@ -192,6 +225,10 @@
*/
public void renderJavascript(CharSequence javascript, String id)
{
+ if (javascript == null)
+ {
+ throw new IllegalArgumentException("javascript cannot
be null");
+ }
if (!closed)
{
List token = Arrays.asList(new Object[] {
javascript.toString(), id });
@@ -208,6 +245,10 @@
*/
public void renderString(CharSequence string)
{
+ if (string == null)
+ {
+ throw new IllegalArgumentException("string cannot be
null");
+ }
if (!closed)
{
String token = string.toString();
@@ -232,6 +273,10 @@
*/
public void renderOnDomReadyJavascript(String javascript)
{
+ if (javascript == null)
+ {
+ throw new IllegalArgumentException("javascript cannot
be null");
+ }
if (!closed)
{
renderOnEventJavacript("window", "domready",
javascript);
@@ -243,6 +288,10 @@
*/
public void renderOnLoadJavascript(String javascript)
{
+ if (javascript == null)
+ {
+ throw new IllegalArgumentException("javascript cannot
be null");
+ }
if (!closed)
{
renderOnEventJavacript("window", "load", javascript);
@@ -258,13 +307,12 @@
{
if (!closed)
{
- List token = Arrays
- .asList(new Object[] {
"javascript-event", target, event, javascript });
+ List token = Arrays.asList(new Object[] {
"javascript-event", target, event, javascript });
if (wasRendered(token) == false)
{
renderJavascriptReference(WicketEventReference.INSTANCE);
JavascriptUtils.writeJavascript(getResponse(),
"Wicket.Event.add(" + target +
- ", \"" + event + "\",
function() { " + javascript + ";});");
+ ", \"" + event + "\", function() { " +
javascript + ";});");
markRendered(token);
}
}
@@ -275,7 +323,7 @@
*/
public void close()
{
- this.closed = true;
+ closed = true;
}
/**
