You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ad...@apache.org on 2002/10/27 09:15:01 UTC
cvs commit: jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs FileUtil.java
adammurdoch 2002/10/27 01:15:01
Modified: vfs/src/java/org/apache/commons/vfs/impl Resource.java
Added: vfs/src/java/org/apache/commons/vfs FileUtil.java
Log:
Moved guts of Resource.getBytes() to new static util class FileUtil.
Revision Changes Path
1.3 +4 -24 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/Resource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resource.java 23 Oct 2002 11:59:40 -0000 1.2
+++ Resource.java 27 Oct 2002 08:15:01 -0000 1.3
@@ -55,14 +55,13 @@
*/
package org.apache.commons.vfs.impl;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.ProtocolException;
import java.net.URL;
-import java.io.IOException;
-import java.io.InputStream;
import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileUtil;
/**
* Helper class for VFSClassLoader. This represents a resource loaded with
@@ -119,25 +118,6 @@
*/
byte[] getBytes() throws IOException
{
- try
- {
- FileContent content = resource.getContent();
- final int size = (int) content.getSize();
- byte[] buf = new byte[ size ];
-
- InputStream in = content.getInputStream();
- int read = in.read( buf );
-
- while ( read < size )
- {
- read += in.read( buf, read, size - read );
- }
-
- return buf;
- }
- catch ( FileSystemException fse )
- {
- throw new ProtocolException( fse.getMessage() );
- }
+ return FileUtil.getContent( resource );
}
}
1.1 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileUtil.java
Index: FileUtil.java
===================================================================
/* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.commons.vfs;
import java.io.IOException;
import java.io.InputStream;
/**
* Utility methods for dealng with FileObjects.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/10/27 08:15:01 $
*/
public class FileUtil
{
private FileUtil()
{
}
/**
* Returns the content of a file, as a byte array.
*
* @param file The file to get the content of.
*/
public static byte[] getContent( final FileObject file )
throws IOException
{
final FileContent content = file.getContent();
final int size = (int) content.getSize();
final byte[] buf = new byte[ size ];
final InputStream in = content.getInputStream();
try
{
int read = 0;
for ( int pos = 0; pos < size && read >= 0; pos += read )
{
read = in.read( buf, pos, size - pos );
}
}
finally
{
in.close();
}
return buf;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>