svn commit: r962814 - in /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util: resource/AbstractResourceStream.java resource/AbstractStringResourceStream.java template/TextTemplateSharedResourceFactory.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Jul 10 11:43:29 2010
New Revision: 962814

URL: http://svn.apache.org/viewvc?rev=962814&view=rev
Log:
fixed WICKET-2892 TextTemplateSharedResourceFactory should use template's 
content type
Issue: WICKET-2892

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java?rev=962814&r1=962813&r2=962814&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
 Sat Jul 10 11:43:29 2010
@@ -35,10 +35,8 @@ import org.apache.wicket.util.time.Time;
  */
 public abstract class AbstractResourceStream implements IStringResourceStream
 {
-       /**
-        * 
-        */
        private static final long serialVersionUID = 1L;
+
        /** Charset for resource */
        private Charset charset;
        private Locale locale;
@@ -102,7 +100,6 @@ public abstract class AbstractResourceSt
                return charset;
        }
 
-
        /**
         * @see org.apache.wicket.util.resource.IResourceStream#getLocale()
         */

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java?rev=962814&r1=962813&r2=962814&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java
 Sat Jul 10 11:43:29 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;
        }
 
@@ -125,6 +126,9 @@ public abstract class AbstractStringReso
         */
        protected abstract String getString();
 
+       /**
+        * @see org.apache.wicket.util.resource.AbstractResourceStream#length()
+        */
        @Override
        public final long length()
        {

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?rev=962814&r1=962813&r2=962814&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
 Sat Jul 10 11:43:29 2010
@@ -117,7 +117,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;