OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FileDescriptor.java (FileDescriptor(String, int)): Throw FileNotFoundException instead of IOException. 

1999-06-10  Warren Levy  <warrenl@cygnus.com>
	* java/io/FileDescriptor.java (FileDescriptor(String, int)):
	Throw FileNotFoundException instead of IOException.
	(open): ditto.
	* java/io/FileInputStream.java (FileInputStream): Doesn't throw
	IOException.
	* java/text/Collator.java (CANONICAL_DECOMPOSITION): Fixed typo
	in static field name.

From-SVN: r27473
This commit is contained in:
Warren Levy 1999-06-10 18:52:00 +00:00 committed by Warren Levy
parent 9a726fc16f
commit a21f23fc67
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -1,3 +1,13 @@
1999-06-10 Warren Levy <warrenl@cygnus.com>
* java/io/FileDescriptor.java (FileDescriptor(String, int)):
Throw FileNotFoundException instead of IOException.
(open): ditto.
* java/io/FileInputStream.java (FileInputStream): Doesn't throw
IOException.
* java/text/Collator.java (CANONICAL_DECOMPOSITION): Fixed typo
in static field name.
1999-06-09 Bryce McKinlay <bryce@albatross.co.nz> 1999-06-09 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Runtime.java (exec): Convert prog name and arguments * java/lang/Runtime.java (exec): Convert prog name and arguments

4
libjava/java/io/FileDescriptor.java
View File

@ -42,7 +42,7 @@ public final class FileDescriptor
static final int CUR = 1; static final int CUR = 1;
// Open a file. MODE is a combination of the above mode flags. // Open a file. MODE is a combination of the above mode flags.
FileDescriptor (String path, int mode) throws IOException FileDescriptor (String path, int mode) throws FileNotFoundException
{ {
fd = open (path, mode); fd = open (path, mode);
} }
@ -52,7 +52,7 @@ public final class FileDescriptor
fd = -1; fd = -1;
} }
native int open (String path, int mode) throws IOException; native int open (String path, int mode) throws FileNotFoundException;
native void write (int b) throws IOException; native void write (int b) throws IOException;
native void write (byte[] b, int offset, int len) native void write (byte[] b, int offset, int len)
throws IOException, NullPointerException, IndexOutOfBoundsException; throws IOException, NullPointerException, IndexOutOfBoundsException;

4
libjava/java/io/FileInputStream.java
View File

@ -23,7 +23,7 @@ public class FileInputStream extends InputStream
/* Contains the file descriptor for referencing the actual file. */ /* Contains the file descriptor for referencing the actual file. */
private FileDescriptor fd; private FileDescriptor fd;
public FileInputStream(String name) throws FileNotFoundException, IOException public FileInputStream(String name) throws FileNotFoundException
{ {
SecurityManager s = System.getSecurityManager(); SecurityManager s = System.getSecurityManager();
if (s != null) if (s != null)
@ -31,7 +31,7 @@ public class FileInputStream extends InputStream
fd = new FileDescriptor(name, FileDescriptor.READ); fd = new FileDescriptor(name, FileDescriptor.READ);
} }
public FileInputStream(File file) throws FileNotFoundException, IOException public FileInputStream(File file) throws FileNotFoundException
{ {
this(file.getPath()); this(file.getPath());
} }

6
libjava/java/text/Collator.java
View File

@ -27,7 +27,7 @@ import java.util.ResourceBundle;
public abstract class Collator implements Cloneable, Serializable public abstract class Collator implements Cloneable, Serializable
{ {
public static final int NO_DECOMPOSITION = 0; public static final int NO_DECOMPOSITION = 0;
public static final int CANONCIAL_DECOMPOSITION = 1; public static final int CANONICAL_DECOMPOSITION = 1;
public static final int FULL_DECOMPOSITION = 2; public static final int FULL_DECOMPOSITION = 2;
public static final int PRIMARY = 0; public static final int PRIMARY = 0;
@ -38,7 +38,7 @@ public abstract class Collator implements Cloneable, Serializable
protected Collator () protected Collator ()
{ {
strength = TERTIARY; strength = TERTIARY;
decmp = CANONCIAL_DECOMPOSITION; decmp = CANONICAL_DECOMPOSITION;
} }
public abstract int compare (String source, String target); public abstract int compare (String source, String target);
@ -107,7 +107,7 @@ public abstract class Collator implements Cloneable, Serializable
public synchronized void setDecomposition (int mode) public synchronized void setDecomposition (int mode)
{ {
if (mode != NO_DECOMPOSITION if (mode != NO_DECOMPOSITION
&& mode != CANONCIAL_DECOMPOSITION && mode != CANONICAL_DECOMPOSITION
&& mode != FULL_DECOMPOSITION) && mode != FULL_DECOMPOSITION)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
decmp = mode; decmp = mode;