[richfaces-svn-commits] JBoss Rich Faces SVN: r6362 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Feb 27 04:16:36 EST 2008
Author: andrei_exadel
Date: 2008-02-27 04:16:36 -0500 (Wed, 27 Feb 2008)
New Revision: 6362
Modified:
trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
code style refactoring
Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-27 09:16:36 UTC (rev 6362)
@@ -100,6 +100,7 @@
<name>maxFilesQuantity</name>
<classname>java.lang.Integer</classname>
<description>Defines max files count allowed for upload (optional).</description>
+ <defaultvalue>1</defaultvalue>
</property>
<property>
<name>addButtonClass</name>
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -2,8 +2,6 @@
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
@@ -14,9 +12,7 @@
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import javax.faces.render.ResponseStateManager;
import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.context.AjaxContextImpl;
@@ -32,7 +28,6 @@
import org.richfaces.component.UIProgressBar;
import org.richfaces.event.UploadEvent;
import org.richfaces.org.jboss.seam.ui.component.UIFileUpload;
-import org.richfaces.org.jboss.seam.web.MultipartFilter;
import org.richfaces.org.jboss.seam.web.MultipartRequest;
import org.richfaces.renderkit.TemplateEncoderRendererBase;
@@ -83,12 +78,13 @@
* @param fileUpload
* @param file
*/
+ @SuppressWarnings("unchecked")
private void storeData(FacesContext context, UIFileUpload fileUpload, File file) {
ValueExpression data = fileUpload.getValueExpression("data");
if (data != null) {
Class clazz = data.getType(context.getELContext());
if (clazz.isAssignableFrom(Map.class)) {
- Map map = (Map) data.getValue(context.getELContext());
+ Map<String, File> map = (Map<String, File>) data.getValue(context.getELContext());
map.put(fileUpload.getLocalFileName(), file);
}
}
@@ -130,6 +126,7 @@
* @return
* @throws IOException
*/
+ @SuppressWarnings("unchecked")
private String getActionScript(FacesContext context, UIComponent component,
String action, Object oncomplete) throws IOException {
JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(
@@ -264,45 +261,6 @@
}
/**
- * Finds an instance of MultipartRequest wrapped within a request or its
- * (recursively) wrapped requests.
- */
- private static ServletRequest unwrapMultipartRequest(ServletRequest request) {
- while (!(request instanceof MultipartRequest)) {
- boolean found = false;
-
- for (Method m : request.getClass().getMethods()) {
- if (ServletRequest.class.isAssignableFrom(m.getReturnType())
- && m.getParameterTypes().length == 0) {
- try {
- request = (ServletRequest) m.invoke(request);
- found = true;
- break;
- } catch (Exception ex) { /* Ignore, try the next one */
- }
- }
- }
-
- if (!found) {
- for (Field f : request.getClass().getDeclaredFields()) {
- if (ServletRequest.class.isAssignableFrom(f.getType())) {
- try {
- request = (ServletRequest) f.get(request);
- } catch (Exception ex) { /* Ignore */
- }
- }
- }
- }
-
- if (!found)
- break;
- }
-
- return request;
- }
-
-
- /**
* Gets progress bar Id
* @param context
* @param component
@@ -355,13 +313,6 @@
if (null == progressBar) {
progressBar = createProgressBar(context, component);
}
-
- //We associate progress bar's percent value in session scope with file upload component id
-// String exprStr = "#{" + MultipartFilter.PERCENT_BEAN_NAME + "['"+component.getClientId(context)+"']}";
-// ValueExpression ex = context.getApplication().getExpressionFactory()
-// .createValueExpression(context.getELContext(), exprStr,
-// Integer.class);
- //progressBar.getAttributes().put("value", 0);
progressBar.getAttributes().put("minValue", -1);
progressBar.getAttributes().put("enabled", false);
progressBar.setTransient(false);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -7,6 +7,10 @@
*/
public class FileUploadException extends RuntimeException
{
+
+ private static final long serialVersionUID = 3142473677581995262L;
+
+
public FileUploadException()
{
this(null, null);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -32,8 +32,10 @@
{
public static final String MULTIPART = "multipart/";
+ /** Session bean name where multipart requests map will be stored */
public static final String REQUESTS_SESSIONS_BEAN_NAME = "_richfaces_upload_sessions";
+ /** Session bean name where progress bar's percent map will be stored */
public static final String PERCENT_BEAN_NAME = "_richfaces_upload_percents";
/**
@@ -66,7 +68,8 @@
this.maxRequestSize = maxFileSize;
}
- public void doFilter(ServletRequest request, ServletResponse response,
+ @SuppressWarnings("unchecked")
+public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
if (!(response instanceof HttpServletResponse)) {
chain.doFilter(request, response);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -240,10 +240,7 @@
private HttpServletRequest request;
- private long time;
-
- //private ProgressData progressData = null;
- private boolean shouldStop = false;
+ private boolean shouldStop = false;
public MultipartRequest(HttpServletRequest request,
boolean createTempFiles, int maxRequestSize, String uid) {
@@ -443,7 +440,7 @@
}
private byte[] getBoundaryMarker(String contentType) {
- Map<String, Object> params = parseParams(contentType, ";");
+ Map<String, String> params = parseParams(contentType, ";");
String boundaryStr = (String) params.get("boundary");
if (boundaryStr == null)
@@ -484,13 +481,13 @@
private static final Pattern FILE_NAME_PATTERN = Pattern
.compile(".*filename=\"(.*)\"");
- private Map parseParams(String paramStr, String separator) {
+ private Map<String, String> parseParams(String paramStr, String separator) {
Map<String, String> paramMap = new HashMap<String, String>();
parseParams(paramStr, separator, paramMap);
return paramMap;
}
- private void parseParams(String paramStr, String separator, Map paramMap) {
+ private void parseParams(String paramStr, String separator, Map<String, String> paramMap) {
String[] parts = paramStr.split(separator);
for (String part : parts) {
Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-27 09:16:36 UTC (rev 6362)
@@ -66,13 +66,13 @@
</div>
</div>
<div class="upload_button_border" style=" float:left;">
- <div class="upload_button upload_font #{component.attributes['uploadButtonClassDisabled']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ <div class="upload_button upload_font #{component.attributes['uploadButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
id="#{clientId}:upload1"
style="display: none"
onclick="return $('#{clientId}').component.upload();">
<a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_start_dis #{component.attributes['uploadButtonClassDisabled']}"
+ <div class="upload_button_content upload_font upload_ico upload_ico_start #{component.attributes['uploadButtonClass']}"
id="#{clientId}:upload2">
<b>Upload</b>
</div>
@@ -85,13 +85,13 @@
<!-- -->
<div class="upload_button_border" style=" float:right">
- <div class="upload_button_dis upload_font #{component.attributes['cleanButtonClassDisabled']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ <div class="upload_button upload_font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
onclick="return $('#{clientId}').component.clear();"
id="#{clientId}:clean1"
style="display: none">
<a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_clear_dis #{component.attributes['cleanButtonClassDisabled']}"
+ <div class="upload_button_content upload_font upload_ico upload_ico_clear_dis #{component.attributes['cleanButtonClass']}"
id="#{clientId}:clean2">Clear All</div>
</a>
</div>
More information about the richfaces-svn-commits
mailing list