[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/04 03:11:41

  Modified:    src/ui/org/jboss/seam/ui  FileUpload.java
  Log:
  JBSEAM-705, JBSEAM-706 file upload control improvements
  
  Revision  Changes    Path
  1.6       +9 -4      jboss-seam/src/ui/org/jboss/seam/ui/FileUpload.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileUpload.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/FileUpload.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- FileUpload.java	27 Jan 2007 11:30:33 -0000	1.5
  +++ FileUpload.java	4 Feb 2007 08:11:41 -0000	1.6
  @@ -1,6 +1,7 @@
   package org.jboss.seam.ui;
   
   import java.io.IOException;
  +import java.io.InputStream;
   
   import javax.faces.component.UIComponentBase;
   import javax.faces.context.FacesContext;
  @@ -44,11 +45,15 @@
            MultipartRequest req = (MultipartRequest) request;
            
            String clientId = getClientId(context);
  -         byte[] fileData = req.getFileBytes(clientId);
            String contentType = req.getFileContentType(clientId);
            String fileName = req.getFileName(clientId);
            
  -         getValueBinding("data").setValue(context, fileData);
  +         ValueBinding dataBinding = getValueBinding("data");
  +         Class cls = dataBinding.getType(context);
  +         if (cls.isAssignableFrom(InputStream.class))
  +            dataBinding.setValue(context, req.getFileInputStream(clientId));
  +         else if (cls.isAssignableFrom(byte[].class))
  +            dataBinding.setValue(context, req.getFileBytes(clientId));
            
            ValueBinding vb = getValueBinding("contentType");
            if (vb != null)