svn commit: r962816 - in /wicket/trunk: wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Jul 10 11:45:39 2010
New Revision: 962816

URL: http://svn.apache.org/viewvc?rev=962816&view=rev
Log:
WICKET-2892 same changes as in 1.4 though TTSRF is unlikely to survive. See 
comments in java code.
Issue: WICKET-2892

Modified:
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java

Modified: 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java?rev=962816&r1=962815&r2=962816&view=diff
==============================================================================
--- 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
 (original)
+++ 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
 Sat Jul 10 11:45:39 2010
@@ -32,11 +32,11 @@ import org.apache.wicket.util.time.Time;
  */
 public abstract class AbstractStringResourceStream extends 
AbstractResourceStream
 {
-       /**
-        * 
-        */
        private static final long serialVersionUID = 1L;
 
+       /** The content-type applied in case the resource stream's default 
constructor is used */
+       public static final String DEFAULT_CONTENT_TYPE = "text";
+
        /** MIME content type */
        private final String contentType;
 
@@ -48,7 +48,7 @@ public abstract class AbstractStringReso
         */
        public AbstractStringResourceStream()
        {
-               this("text");
+               this(DEFAULT_CONTENT_TYPE);
        }
 
        /**
@@ -59,6 +59,7 @@ public abstract class AbstractStringReso
         */
        public AbstractStringResourceStream(final String contentType)
        {
+               // TODO null for contentType is allowed? or should the default 
be applied instead?
                this.contentType = contentType;
        }
 

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?rev=962816&r1=962815&r2=962816&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
 Sat Jul 10 11:45:39 2010
@@ -119,7 +119,11 @@ public class TextTemplateSharedResourceF
 // @Override
 // public IResourceStream getResourceStream()
 // {
-// return new AbstractStringResourceStream()
+// String contentType = template.getContentType() == null
+// ? AbstractStringResourceStream.DEFAULT_CONTENT_TYPE
+// : template.getContentType();
+//
+// return new AbstractStringResourceStream(contentType)
 // {
 // private static final long serialVersionUID = 1L;
 //