You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2004/12/02 01:26:58 UTC
cvs commit: incubator-myfaces/src/components/org/apache/myfaces/component/html/util ExtensionsResponseWrapper.java
oros 2004/12/01 16:26:58
Modified: src/components/org/apache/myfaces/component/html/util
ExtensionsResponseWrapper.java
Log:
i18n issues
Revision Changes Path
1.2 +17 -14 incubator-myfaces/src/components/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java
Index: ExtensionsResponseWrapper.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionsResponseWrapper.java 1 Dec 2004 20:25:10 -0000 1.1
+++ ExtensionsResponseWrapper.java 2 Dec 2004 00:26:58 -0000 1.2
@@ -15,10 +15,7 @@
*/
package org.apache.myfaces.component.html.util;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
@@ -29,10 +26,13 @@
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$ $Log$
- * @version $Revision: 1.1 $ $Date: 2004/12/01 16:32:03 $ Revision 1.1 2004/12/01 20:25:10 svieujot
- * @version $Revision: 1.1 $ $Date: 2004/12/01 16:32:03 $ Make the Extensions filter support css and image resources.
- * @version $Revision: 1.1 $ $Date: 2004/12/01 16:32:03 $ Convert the popup calendar to use this new filter.
- * @version $Revision: 1.1 $ $Date: 2004/12/01 16:32:03 $
+ * @version $Revision: 1.1 $ $Date: 2004/12/01 20:25:10 $ Revision 1.2 2004/12/02 00:26:58 oros
+ * @version $Revision: 1.1 $ $Date: 2004/12/01 20:25:10 $ i18n issues
+ * @version $Revision: 1.1 $ $Date: 2004/12/01 20:25:10 $
+ * @version $Revision$ $Date$ Revision 1.1 2004/12/01 20:25:10 svieujot
+ * @version $Revision$ $Date$ Make the Extensions filter support css and image resources.
+ * @version $Revision$ $Date$ Convert the popup calendar to use this new filter.
+ * @version $Revision$ $Date$
*
*/
public class ExtensionsResponseWrapper extends HttpServletResponseWrapper {
@@ -42,17 +42,19 @@
super( response );
output = new ByteArrayOutputStream();
}
-
+
+
+ public byte[] getBytes() {
+ return output.toByteArray();
+ }
+
public String toString(){
- return output.toString();
- //return new String( output.toByteArray() );
- /*
try{
- return output.toString( "UTF-8" ); // convertion
- }catch(UnsupportedEncodingException uee){
- uee.printStackTrace();
- return output.toString();
- } */
+ return output.toString(getCharacterEncoding());
+ }catch(UnsupportedEncodingException e){
+ // an attempt to set an invalid character encoding would have caused this exception before
+ throw new RuntimeException("Response accepted invalid character encoding " + getCharacterEncoding());
+ }
}
/** This method is used by Tomcat.