From 482077092ade857677d3e918afe869c9e923b3e4 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 29 Apr 2005 16:57:05 +0000 Subject: 2005-04-29 Dalibor Topic * java/nio/channels/FileChannelImpl.java (FileChannelImpl(Sting, int)): Removed. (FileChannelImpl(File, int)) Added. Check if opened file is a directory. * java/io/FileInputStream.java(FileInputStream): Fixed javadocs. Call FileChannelImpl(File, int). * java/io/FileOutputStream.java (FileInputStream): Call FileChannelImpl(File, int). * java/io/RandomAccessFile.java (RandomAccessFile): Call FileChannelImpl(File, int). Switched constructors around. --- java/io/FileInputStream.java | 8 +++--- java/io/FileOutputStream.java | 8 +++--- java/io/RandomAccessFile.java | 62 +++++++++++++++++++++++-------------------- 3 files changed, 42 insertions(+), 36 deletions(-) (limited to 'java') diff --git a/java/io/FileInputStream.java b/java/io/FileInputStream.java index ebd5d20ad..c71995543 100644 --- a/java/io/FileInputStream.java +++ b/java/io/FileInputStream.java @@ -76,7 +76,8 @@ public class FileInputStream extends InputStream * @param name The name of the file this stream should read from * * @exception SecurityException If read access to the file is not allowed - * @exception FileNotFoundException If the file does not exist. + * @exception FileNotFoundException If the file does not exist + * or if it is a directory */ public FileInputStream(String name) throws FileNotFoundException { @@ -97,7 +98,8 @@ public class FileInputStream extends InputStream * @param file The File object this stream should read from * * @exception SecurityException If read access to the file is not allowed - * @exception FileNotFoundException If the file does not exist. + * @exception FileNotFoundException If the file does not exist + * or if it is a directory. */ public FileInputStream(File file) throws FileNotFoundException { @@ -105,7 +107,7 @@ public class FileInputStream extends InputStream if (s != null) s.checkRead(file.getPath()); - ch = new FileChannelImpl (file.getPath(), FileChannelImpl.READ); + ch = new FileChannelImpl (file, FileChannelImpl.READ); } /** diff --git a/java/io/FileOutputStream.java b/java/io/FileOutputStream.java index d5fa2d3bb..e8784429e 100644 --- a/java/io/FileOutputStream.java +++ b/java/io/FileOutputStream.java @@ -155,10 +155,10 @@ public class FileOutputStream extends OutputStream if (s != null) s.checkWrite(file.getPath()); - ch = new FileChannelImpl (file.getPath(), (append - ? FileChannelImpl.WRITE - | FileChannelImpl.APPEND - : FileChannelImpl.WRITE)); + ch = new FileChannelImpl (file, (append + ? FileChannelImpl.WRITE + | FileChannelImpl.APPEND + : FileChannelImpl.WRITE)); } /** diff --git a/java/io/RandomAccessFile.java b/java/io/RandomAccessFile.java index c23ca3adf..ef367949a 100644 --- a/java/io/RandomAccessFile.java +++ b/java/io/RandomAccessFile.java @@ -86,37 +86,11 @@ public class RandomAccessFile implements DataOutput, DataInput * illegal value * @exception SecurityException If the requested access to the file * is not allowed - * @exception IOException If any other error occurs + * @exception FileNotFoundException If the file is a directory, or + * any other error occurs */ public RandomAccessFile (File file, String mode) throws FileNotFoundException - { - this (file.getPath(), mode); - } - - /** - * This method initializes a new instance of RandomAccessFile - * to read from the specified file name with the specified access mode. - * The access mode is either "r" for read only access, "rw" for read - * write access, "rws" for synchronized read/write access of both - * content and metadata, or "rwd" for read/write access - * where only content is required to be synchronous. - *

- * Note that a SecurityManager check is made prior to - * opening the file to determine whether or not this file is allowed to - * be read or written. - * - * @param fileName The name of the file to read and/or write - * @param mode "r", "rw", "rws", or "rwd" - * - * @exception IllegalArgumentException If mode has an - * illegal value - * @exception SecurityException If the requested access to the file - * is not allowed - * @exception FileNotFoundException If any other error occurs - */ - public RandomAccessFile (String fileName, String mode) - throws FileNotFoundException { int fdmode; if (mode.equals("r")) @@ -136,6 +110,8 @@ public class RandomAccessFile implements DataOutput, DataInput else throw new IllegalArgumentException ("invalid mode: " + mode); + final String fileName = file.getPath(); + // The obligatory SecurityManager stuff SecurityManager s = System.getSecurityManager(); if (s != null) @@ -146,12 +122,40 @@ public class RandomAccessFile implements DataOutput, DataInput s.checkWrite(fileName); } - ch = new FileChannelImpl (fileName, fdmode); + ch = new FileChannelImpl (file, fdmode); fd = new FileDescriptor(ch); out = new DataOutputStream (new FileOutputStream (fd)); in = new DataInputStream (new FileInputStream (fd)); } + /** + * This method initializes a new instance of RandomAccessFile + * to read from the specified file name with the specified access mode. + * The access mode is either "r" for read only access, "rw" for read + * write access, "rws" for synchronized read/write access of both + * content and metadata, or "rwd" for read/write access + * where only content is required to be synchronous. + *

+ * Note that a SecurityManager check is made prior to + * opening the file to determine whether or not this file is allowed to + * be read or written. + * + * @param fileName The name of the file to read and/or write + * @param mode "r", "rw", "rws", or "rwd" + * + * @exception IllegalArgumentException If mode has an + * illegal value + * @exception SecurityException If the requested access to the file + * is not allowed + * @exception FileNotFoundException If the file is a directory or + * any other error occurs + */ + public RandomAccessFile (String fileName, String mode) + throws FileNotFoundException + { + this (new File(fileName), mode); + } + /** * This method closes the file and frees up all file related system * resources. Since most operating systems put a limit on how many files -- cgit v1.2.1