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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27473 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 7 insertions, 7 deletions

diff --git a/libjava/java/io/FileDescriptor.java b/libjava/java/io/FileDescriptor.java
index 0782b0c8e95..d345db29ad7 100644
--- a/libjava/java/io/FileDescriptor.java
+++ b/libjava/java/io/FileDescriptor.java
@@ -42,7 +42,7 @@ public final class FileDescriptor
   static final int CUR = 1;
 
   // 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);
   }
@@ -52,7 +52,7 @@ public final class FileDescriptor
     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 (byte[] b, int offset, int len)
     throws IOException, NullPointerException, IndexOutOfBoundsException;
diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index 4f44dae03b7..04ad6dd78db 100644
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -23,7 +23,7 @@ public class FileInputStream extends InputStream
   /* Contains the file descriptor for referencing the actual file. */
   private FileDescriptor fd;
 
-  public FileInputStream(String name) throws FileNotFoundException, IOException
+  public FileInputStream(String name) throws FileNotFoundException
   {
     SecurityManager s = System.getSecurityManager();
     if (s != null)
@@ -31,7 +31,7 @@ public class FileInputStream extends InputStream
     fd = new FileDescriptor(name, FileDescriptor.READ);
   }
 
-  public FileInputStream(File file) throws FileNotFoundException, IOException
+  public FileInputStream(File file) throws FileNotFoundException
   {
     this(file.getPath());
   }
diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java
index ad7a5ca30c1..c323fc79a64 100644
--- a/libjava/java/text/Collator.java
+++ b/libjava/java/text/Collator.java
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
 public abstract class Collator implements Cloneable, Serializable
 {
   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 PRIMARY = 0;
@@ -38,7 +38,7 @@ public abstract class Collator implements Cloneable, Serializable
   protected Collator ()
   {
     strength = TERTIARY;
-    decmp = CANONCIAL_DECOMPOSITION;
+    decmp = CANONICAL_DECOMPOSITION;
   }
 
   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)
   {
     if (mode != NO_DECOMPOSITION
-	&& mode != CANONCIAL_DECOMPOSITION
+	&& mode != CANONICAL_DECOMPOSITION
 	&& mode != FULL_DECOMPOSITION)
       throw new IllegalArgumentException ();
     decmp = mode;