Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 25945 invoked from network); 6 Feb 2002 07:28:48 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 6 Feb 2002 07:28:48 -0000 Received: (qmail 3378 invoked by uid 97); 6 Feb 2002 07:28:48 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 3362 invoked by uid 97); 6 Feb 2002 07:28:48 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 3351 invoked by uid 97); 6 Feb 2002 07:28:47 -0000 Date: 6 Feb 2002 07:28:41 -0000 Message-ID: <20020206072841.71474.qmail@icarus.apache.org> From: adammurdoch@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider AbstractFileObject.java DefaultFileContent.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N adammurdoch 02/02/05 23:28:41 Modified: proposal/myrmidon/src/java/org/apache/aut/vfs FileContent.java FileSystemException.java proposal/myrmidon/src/java/org/apache/aut/vfs/provider AbstractFileObject.java DefaultFileContent.java Log: Got rid of some audit violations. Revision Changes Path 1.2 +0 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileContent.java Index: FileContent.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileContent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileContent.java 2 Feb 2002 03:29:07 -0000 1.1 +++ FileContent.java 6 Feb 2002 07:28:40 -0000 1.2 @@ -9,9 +9,6 @@ import java.io.InputStream; import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; -import java.sql.Date; /** * This interface is used to access the data content of a file. 1.2 +0 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileSystemException.java Index: FileSystemException.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileSystemException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileSystemException.java 2 Feb 2002 03:29:07 -0000 1.1 +++ FileSystemException.java 6 Feb 2002 07:28:40 -0000 1.2 @@ -16,8 +16,6 @@ */ public class FileSystemException extends CascadingException { - private Throwable m_cause; - /** * Constructs exception with the specified detail message. * 1.2 +1 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java Index: AbstractFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractFileObject.java 2 Feb 2002 03:29:08 -0000 1.1 +++ AbstractFileObject.java 6 Feb 2002 07:28:41 -0000 1.2 @@ -534,6 +534,7 @@ if( m_type == FileType.FOLDER ) { final String message = REZ.getString( "write-folder.error", m_name ); + throw new FileSystemException( message ); } if( m_type == null ) 1.2 +3 -8 jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java Index: DefaultFileContent.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultFileContent.java 2 Feb 2002 03:29:08 -0000 1.1 +++ DefaultFileContent.java 6 Feb 2002 07:28:41 -0000 1.2 @@ -11,17 +11,12 @@ import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; -import java.sql.Date; import org.apache.aut.vfs.FileContent; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * The content of a file. @@ -275,7 +270,7 @@ /** * Reads bytes from this input stream.error occurs. */ - public int read( byte b[], int off, int len ) + public int read( byte[] buffer, int offset, int length ) throws IOException { if( _finished ) @@ -283,7 +278,7 @@ return -1; } - int nread = super.read( b, off, len ); + int nread = super.read( buffer, offset, length ); if( nread != -1 ) { return nread; -- To unsubscribe, e-mail: For additional commands, e-mail: