svn commit: r819118 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: markup/html/include/Include.java util/resource/AbstractResourceStream.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sat Sep 26 12:38:20 2009
New Revision: 819118

URL: http://svn.apache.org/viewvc?rev=819118&view=rev
Log:
fixed: Include component does not handle UTF-8 content correctly
Issue: WICKET-2372

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java?rev=819118&r1=819117&r2=819118&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java Sat Sep 26 12:38:20 2009
@@ -18,6 +18,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.Charset;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -254,6 +255,15 @@
 	}
 
 	/**
+	 * 
+	 * @return The charset of the text to be retrieved and included
+	 */
+	public Charset getCharset()
+	{
+		return null;
+	}
+
+	/**
 	 * Imports the contents from the given url.
 	 * 
 	 * @param url
@@ -263,6 +273,11 @@
 	private final String importUrl(URL url)
 	{
 		UrlResourceStream resourceStream = new UrlResourceStream(url);
+		Charset charset = getCharset();
+		if (charset != null)
+		{
+			resourceStream.setCharset(charset);
+		}
 		String content = resourceStream.asString();
 		return content;
 	}

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java?rev=819118&r1=819117&r2=819118&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/AbstractResourceStream.java Sat Sep 26 12:38:20 2009
@@ -35,10 +35,8 @@
  */
 public abstract class AbstractResourceStream implements IStringResourceStream
 {
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1L;
+
 	/** Charset for resource */
 	private Charset charset;
 	private Locale locale;