svn commit: r668743 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/util/resource/IResourceStream.java main/java/org/apache/wicket/util/resource/StringResourceStream.java test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java

[ivaynberg]

Author: ivaynberg
Date: Tue Jun 17 10:00:20 2008
New Revision: 668743

URL: http://svn.apache.org/viewvc?rev=668743&view=rev
Log:
WICKET-1704

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java?rev=668743&r1=668742&r2=668743&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
 Tue Jun 17 10:00:20 2008
@@ -51,7 +51,9 @@
        String getContentType();
 
        /**
-        * Gets the size of this resource
+        * Gets the size of this resource in bytes
+        * 
+        * TODO 1.5: rename to lengthInBytes() or let it return some sort of 
size object
         * 
         * @return The size of this resource in the number of bytes, or -1 if 
unknown
         */

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java?rev=668743&r1=668742&r2=668743&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
 Tue Jun 17 10:00:20 2008
@@ -59,6 +59,7 @@
        /**
         * @see java.lang.Object#toString()
         */
+       @Override
        public String toString()
        {
                return string.toString();
@@ -67,6 +68,7 @@
        /**
         * @see 
org.apache.wicket.util.resource.AbstractStringResourceStream#getString()
         */
+       @Override
        protected String getString()
        {
                return toString();
@@ -75,6 +77,7 @@
        /**
         * @see 
org.apache.wicket.util.resource.AbstractResourceStream#asString()
         */
+       @Override
        public String asString()
        {
                return getString();
@@ -83,9 +86,12 @@
        /**
         * @see org.apache.wicket.util.resource.IResourceStream#length()
         */
+       @Override
        public long length()
        {
-               return string.length();
+               // WICKET-1705: we cannot use string.length() because we need 
number of bytes rather then
+               // number of characters
+               return string.toString().getBytes().length;
        }
 
 }

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?rev=668743&r1=668742&r2=668743&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
 Tue Jun 17 10:00:20 2008
@@ -345,6 +345,7 @@
         */
        public void testRenderHomePage_7() throws Exception
        {
+               
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
                // This is for issue 
https://issues.apache.org/jira/browse/WICKET-590
                executeTest(SimplePage_7.class, 
"SimplePageExpectedResult_7.html");
        }