Author: ivaynberg
Date: Fri Aug 29 08:34:35 2008
New Revision: 690304
URL: http://svn.apache.org/viewvc?rev=690304&view=rev
Log:
WICKET-1809: align code with wicket-1.3.x version
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java?rev=690304&r1=690303&r2=690304&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/StringRequestTarget.java
Fri Aug 29 08:34:35 2008
@@ -19,6 +19,7 @@
import java.io.OutputStream;
import java.nio.charset.Charset;
+import org.apache.wicket.Application;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
@@ -54,10 +55,9 @@
*/
public StringRequestTarget(String string)
{
- this("text/plain", Charset.defaultCharset(), string);
+ this("text/plain", getDefaultCharset(), string);
}
-
/**
* Constructor
*
@@ -88,6 +88,20 @@
this.charset = charset;
}
+ /**
+ * Retrieves default charset configured in application
+ *
+ * @return charset
+ */
+ private static Charset getDefaultCharset()
+ {
+ final String charsetName = Application.get()
+ .getRequestCycleSettings()
+ .getResponseRequestEncoding();
+
+ return Charset.forName(charsetName);
+ }
+
/**
* Responds by sending the string property.
