From richfaces-svn-commits at lists.jboss.org Fri Nov 26 11:32:05 2010 Content-Type: multipart/mixed; boundary="===============4874189864631202486==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r20182 - in sandbox/trunk/ui/fileupload/ui/src/main: java/org/richfaces/context and 1 other directories. Date: Fri, 26 Nov 2010 11:32:05 -0500 Message-ID: <201011261632.oAQGW5fs019654@svn01.web.mwc.hst.phx2.redhat.com> --===============4874189864631202486== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2010-11-26 11:32:05 -0500 (Fri, 26 Nov 2010) New Revision: 20182 Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/Abs= tractFileUpload.java sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/FileU= ploadPartialViewContextFactory.java sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml Log: RF-9497 Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/compon= ent/AbstractFileUpload.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/Ab= stractFileUpload.java 2010-11-26 16:20:08 UTC (rev 20181) +++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/Ab= stractFileUpload.java 2010-11-26 16:32:05 UTC (rev 20182) @@ -33,6 +33,7 @@ import javax.faces.event.PostAddToViewEvent; = import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; @@ -52,6 +53,12 @@ @Attribute(defaultValue =3D "true") public abstract boolean isEnabled(); = + @Attribute(events =3D @EventName("filesubmit")) + public abstract String getOnfilesubmit(); + + @Attribute(events =3D @EventName("uploadcomplete")) + public abstract String getOnuploadcomplete(); + @Override public void decode(FacesContext context) { super.decode(context); Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/contex= t/FileUploadPartialViewContextFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/File= UploadPartialViewContextFactory.java 2010-11-26 16:20:08 UTC (rev 20181) +++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/File= UploadPartialViewContextFactory.java 2010-11-26 16:32:05 UTC (rev 20182) @@ -48,6 +48,10 @@ */ public class FileUploadPartialViewContextFactory extends PartialViewContex= tFactory { = + private static enum ResponseState { + size_exceeded, stopped, server_error + }; + = private static final Logger LOGGER =3D RichfacesLogger.CONTEXT.getLogg= er(); = private static final Pattern AMPERSAND =3D Pattern.compile("&+"); @@ -90,22 +94,19 @@ String uid =3D queryParamMap.get(UID_KEY); if (uid !=3D null) { if (maxRequestSize !=3D 0 && externalContext.getRequestContent= Length() > maxRequestSize) { - printResponse(facesContext, ""); - } else if (!checkFileCount(externalContext, queryParamMap.get(= "id"))) { - printResponse(facesContext, ""); + printResponse(facesContext, uid, ResponseState.size_exceed= ed); } else { MultipartRequest multipartRequest =3D new MultipartRequest= (request, createTempFiles, tempFilesDirectory, maxRequestSize, uid); try { multipartRequest.parseRequest(); if (!multipartRequest.isDone()) { - printResponse(facesContext, ""); + printResponse(facesContext, uid, ResponseState.sto= pped); } else { externalContext.setRequest(multipartRequest); } } catch (FileUploadException e) { - printResponse(facesContext, ""); - throw e; // TODO remove it + printResponse(facesContext, uid, ResponseState.server_= error); } finally { multipartRequest.clearRequestData(); } @@ -114,27 +115,6 @@ return parentFactory.getPartialViewContext(facesContext); } = - private boolean checkFileCount(ExternalContext externalContext, String= idParameter) { - // TODO implement this method - // HttpSession session =3D externalContext.getSession(false); - // - // if (session !=3D null) { - // Map map =3D (Map) session - // .getAttribute(FileUploadConstants.UPLOADED_COUNTER); - // - // if (map !=3D null) { - // String id =3D idParameter; - // if (id !=3D null) { - // Integer i =3D map.get(id); - // if (i !=3D null && i =3D=3D 0) { - // return false; - // } - // } - // } - // } - return true; - } - private Map parseQueryString(String queryString) { if (queryString !=3D null) { Map parameters =3D new HashMap= (); @@ -165,14 +145,14 @@ } } = - private void printResponse(FacesContext facesContext, String message) { + private void printResponse(FacesContext facesContext, String uid, Resp= onseState state) { facesContext.responseComplete(); ExternalContext externalContext =3D facesContext.getExternalContex= t(); externalContext.setResponseStatus(HttpServletResponse.SC_OK); externalContext.setResponseContentType(MultipartRequest.TEXT_HTML); try { Writer writer =3D externalContext.getResponseOutputWriter(); - writer.write(message); + writer.write(""); writer.close(); } catch (IOException e) { LOGGER.error(e); Modified: sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.temp= late.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.x= ml 2010-11-26 16:20:08 UTC (rev 20181) +++ sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.x= ml 2010-11-26 16:32:05 UTC (rev 20182) @@ -34,6 +34,7 @@ + @@ -72,7 +73,10 @@