svn commit: r1073626 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java

[mgrigorov]

Author: mgrigorov
Date: Wed Feb 23 07:53:56 2011
New Revision: 1073626

URL: http://svn.apache.org/viewvc?rev=1073626&view=rev
Log:
WICKET-3187 StringResourceStream has null lastModified time

Reduce code duplication by chaining methods.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java?rev=1073626&r1=1073625&r2=1073626&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
 Wed Feb 23 07:53:56 2011
@@ -19,9 +19,11 @@ package org.apache.wicket.util.template;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.apache.wicket.util.time.Time;
 
@@ -50,10 +52,7 @@ public abstract class TextTemplateDecora
         */
        public TextTemplateDecorator(TextTemplate textTemplate)
        {
-               if (textTemplate == null)
-               {
-                       throw new IllegalArgumentException("argument 
textTemplate must be not null");
-               }
+               Args.notNull(textTemplate, "textTemplate");
 
                decorated = textTemplate;
        }
@@ -68,11 +67,7 @@ public abstract class TextTemplateDecora
        @Override
        public String asString()
        {
-        StringBuilder b = new StringBuilder();
-               b.append(getBeforeTemplateContents());
-               b.append(decorated.asString());
-               b.append(getAfterTemplateContents());
-               return b.toString();
+               return asString(Collections.<String, Object> emptyMap());
        }
 
        /**
@@ -85,7 +80,7 @@ public abstract class TextTemplateDecora
        @Override
        public String asString(Map<String, ?> variables)
        {
-        StringBuilder b = new StringBuilder();
+               StringBuilder b = new StringBuilder();
                b.append(getBeforeTemplateContents());
                b.append(decorated.asString(variables));
                b.append(getAfterTemplateContents());