JBoss Rich Faces SVN: r9688 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
- First Post
- Replies
- Stats
-
Go to
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
Author: andrei_exadel
Date: 2008-07-18 09:17:21 -0400 (Fri, 18 Jul 2008)
New Revision: 9688
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
refactoring
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18
12:34:00 UTC (rev 9687)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18
13:17:21 UTC (rev 9688)
@@ -38,8 +38,10 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.ServletResponseWrapper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;
import org.ajax4jsf.Messages;
@@ -335,7 +337,12 @@
sessionsMap.put(uid, multipartRequest);
if (multipartRequest.parseRequest()) {
- handleRequest(multipartRequest, response, chain);
+ handleRequest(multipartRequest, new HttpServletResponseWrapper(response){
+ @Override
+ public void setContentType(String type) {
+ super.setContentType(BaseXMLFilter.TEXT_HTML + ";charset=UTF-8");
+ }
+ }, chain);
} else {
printResponse(response, "<html
id=\"_richfaces_file_upload_stopped\"></html>");
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18
12:34:00 UTC (rev 9687)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18
13:17:21 UTC (rev 9688)
@@ -235,9 +235,9 @@
// TODO - for null encoding, setup only Output encoding for
// filter ?
String outputEncoding = "UTF-8";
- String contentType = getMimetype(request) + ";charset=" + outputEncoding;
+ String contentType = getMimetype() + ";charset=" + outputEncoding;
response.setContentType(contentType);
- parser = getParser(getMimetype(request), true, viewId);
+ parser = getParser(getMimetype(), true, viewId);
if (null == parser) {
throw new ServletException(Messages.getMessage(
Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType));
@@ -501,19 +501,6 @@
}
/**
- * Returns text/HTML mime type if request was sent from FileUpload.
- * Else returns mimetype defined.
- * @return Returns the mimetype.
- */
- public String getMimetype(HttpServletRequest request) {
- if (request != null && request.getParameter(Filter.FILE_UPLOAD_INDICATOR) !=
null
- &&
"true".equals(request.getParameter(Filter.FILE_UPLOAD_INDICATOR))) {
- return TEXT_HTML;
- }
- return mimetype;
- }
-
- /**
* @return Returns the forcexml.
*/
public boolean isForcexml() {
6532
days inactive
6532
days old
richfaces-svn-commits@lists.jboss.org
0 comments
1 participants
tags (0)
participants (1)
-
richfaces-svn-commits＠lists.jboss.org