Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 72138 invoked from network); 14 Aug 2005 08:29:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Aug 2005 08:29:03 -0000 Received: (qmail 99380 invoked by uid 500); 14 Aug 2005 08:29:02 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 99338 invoked by uid 500); 14 Aug 2005 08:29:01 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 99325 invoked by uid 99); 14 Aug 2005 08:29:01 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 14 Aug 2005 01:29:01 -0700 Received: (qmail 72070 invoked by uid 65534); 14 Aug 2005 08:29:01 -0000 Message-ID: <20050814082901.72069.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232592 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource: FilePartDataSource.java SourceDataSource.java Date: Sun, 14 Aug 2005 08:29:00 -0000 To: cvs@cocoon.apache.org From: antonio@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: antonio Date: Sun Aug 14 01:28:57 2005 New Revision: 232592 URL: http://svn.apache.org/viewcvs?rev=232592&view=rev Log: Organize imports Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/SourceDataSource.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java?rev=232592&r1=232591&r2=232592&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java Sun Aug 14 01:28:57 2005 @@ -16,6 +16,10 @@ package org.apache.cocoon.mail.datasource; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + import javax.activation.DataSource; import org.apache.cocoon.servlet.multipart.Part; @@ -27,13 +31,13 @@ * * @author Frank Ridderbusch * @author Christian Haul - * @version CVS $Id: FilePartDataSource.java,v 1.5 2004/03/05 13:02:00 bdelacretaz Exp $ + * @version CVS $Id$ */ public class FilePartDataSource implements DataSource { private Part part; private String contentType = null; private String name = null; - + /** Creates a new instance of FilePartDataSource from an * {@link Part} object. * @param part An {@link Part} object. @@ -41,7 +45,7 @@ public FilePartDataSource(Part part) { this(part,null,null); } - + /** Creates a new instance of FilePartDataSource from an * {@link Part} object. * @param part An {@link Part} object. @@ -62,7 +66,7 @@ private boolean isNullOrEmpty(String str) { return (str == null || "".equals(str) || "null".equals(str)); } - + /** Return the content type (mime type) obtained from * {@link Part#getMimeType()}. * Return application/octet-stream if getMimeType() @@ -79,23 +83,23 @@ } return mimeType; } - + /** The InputStream object obtained from * {@link Part#getInputStream()} * object. * @throws java.io.IOException if an I/O error occurs. * @return The InputStream object for this DataSource object. */ - public java.io.InputStream getInputStream() throws java.io.IOException { - java.io.InputStream inp; + public InputStream getInputStream() throws IOException { + InputStream inp; try { inp = part.getInputStream(); } catch (Exception e) { - throw new java.io.IOException(e.getMessage()); + throw new IOException(e.getMessage()); } return inp; } - + /** Returns the name for this DataSource object. This is * what is returned by * {@link Part#getFileName()}. @@ -106,13 +110,12 @@ if (isNullOrEmpty(name)) name="attachment"; return name; } - + /** Unimplemented. Directly throws IOException. * @throws java.io.IOException since unimplemented * @return nothing */ - public java.io.OutputStream getOutputStream() throws java.io.IOException { - throw new java.io.IOException("no data sink available"); + public OutputStream getOutputStream() throws IOException { + throw new IOException("no data sink available"); } - } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/SourceDataSource.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/SourceDataSource.java?rev=232592&r1=232591&r2=232592&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/SourceDataSource.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/datasource/SourceDataSource.java Sun Aug 14 01:28:57 2005 @@ -15,6 +15,10 @@ */ package org.apache.cocoon.mail.datasource; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + import javax.activation.DataSource; import org.apache.excalibur.source.Source; @@ -90,7 +94,7 @@ * @return The InputStream object from the Source object. * @see org.apache.excalibur.source.Source#getInputStream() */ - public java.io.InputStream getInputStream() throws java.io.IOException { + public InputStream getInputStream() throws IOException { return src.getInputStream(); } @@ -116,7 +120,7 @@ * @throws java.io.IOException since unimplemented * @return nothing */ - public java.io.OutputStream getOutputStream() throws java.io.IOException { - throw new java.io.IOException("no data sink available"); + public OutputStream getOutputStream() throws IOException { + throw new IOException("no data sink available"); } }