You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ef...@apache.org on 2007/08/23 09:53:52 UTC
svn commit: r568871 -
/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java
Author: efastl
Date: Thu Aug 23 00:53:51 2007
New Revision: 568871
URL: http://svn.apache.org/viewvc?rev=568871&view=rev
Log:
fix for TOMAHAWK-1089 obtain encoding from responseWriter
Modified:
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java?rev=568871&r1=568870&r2=568871&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupRenderer.java Thu Aug 23 00:53:51 2007
@@ -18,6 +18,18 @@
*/
package org.apache.myfaces.custom.ppr;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.custom.dojo.DojoConfig;
@@ -30,17 +42,6 @@
import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
import org.apache.myfaces.shared_tomahawk.renderkit.html.util.FormInfo;
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.IOException;
-import java.util.*;
-
/**
* @author Ernst Fastl
*/
@@ -200,11 +201,8 @@
requestMap.put(PPR_INITIALIZED, Boolean.TRUE);
String encoding = "UTF-8" ; // Hardcoded default
- if(externalContext.getRequest() instanceof HttpServletRequest){
- HttpServletRequest request = (HttpServletRequest) externalContext.getRequest();
- if(request.getCharacterEncoding() != null)
- encoding = request.getCharacterEncoding();
- }
+ if(facesContext.getResponseWriter().getCharacterEncoding() != null)
+ encoding = facesContext.getResponseWriter().getCharacterEncoding();
DojoConfig currentConfig = DojoUtils.getDjConfigInstance(facesContext);
currentConfig.setBindEncoding(encoding);