[Ogoglio-commits] SF.net SVN: ogoglio: [334] maven/trunk/ogoglio-appdev/src/main/java/com/ ogoglio/appdev/servlet/AbstractResourceServlet.java

[<tre...@us...>]

Revision: 334
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=334&view=rev
Author:   trevorolio
Date:     2007-09-02 11:12:39 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
Made the whiteboard info panel provide image upload capabilities.
Fixed a bug in which browser form uploads of images resulted in displaying the image file as text (aka horrid text junk).

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java	2007-09-02 17:22:56 UTC (rev 333)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java	2007-09-02 18:12:39 UTC (rev 334)
@@ -40,6 +40,7 @@
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 
+import com.ogoglio.client.DecoratedInputStream;
 import com.ogoglio.util.StreamUtils;
 import com.ogoglio.util.WebConstants;
 import com.ogoglio.xml.SpaceDocument;
@@ -263,7 +264,7 @@
         }
     }
 
-    public static InputStream getFirstFile(HttpServletRequest request, long maxSize) throws IOException {
+    public static DecoratedInputStream getFirstFile(HttpServletRequest request, long maxSize) throws IOException {
         FileItemFactory factory = new DiskFileItemFactory();
         ServletFileUpload upload = new ServletFileUpload(factory);
         upload.setSizeMax(maxSize);
@@ -271,11 +272,10 @@
             Iterator iter = upload.parseRequest(request).iterator();
             while (iter.hasNext()) {
                 FileItem item = (FileItem) iter.next();
-
                 if (item.isFormField()) {
                     //ignore it.
                 } else {
-                    return item.getInputStream();
+                    return new DecoratedInputStream(item.getInputStream(), -1, item.getContentType(), -1);
                 }
             }
         } catch (FileUploadException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.