Re-merge with Classpath:

	* java/util/Comparator (equals): Added.
	* java/io/PipedWriter.java (write): Changed argument to `int'.

	* java/io/FileDescriptor.java (FileDescriptor()): New
	constructor.
	* java/io/File.java (getAbsoluteFile): Doesn't throw IOException.

From-SVN: r45337

3 files changed, 8 insertions, 3 deletions

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 25b6fcd..12297ac 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -157,7 +157,7 @@ public class File implements Serializable, Comparable
   }
 
   /** @since 1.2 */
-  public File getAbsoluteFile () throws IOException
+  public File getAbsoluteFile ()
   {
     return new File (getAbsolutePath());
   }
diff --git a/libjava/java/io/FileDescriptor.java b/libjava/java/io/FileDescriptor.java
index 8afcda4..a8bf751 100644
--- a/libjava/java/io/FileDescriptor.java
+++ b/libjava/java/io/FileDescriptor.java
@@ -43,6 +43,11 @@ public final class FileDescriptor
   static final int SET = 0;
   static final int CUR = 1;
 
+  // This constructor is specified to create an invalid descriptor.
+  public FileDescriptor ()
+  {
+  }
+
   // Open a file.  MODE is a combination of the above mode flags.
   FileDescriptor (String path, int mode) throws FileNotFoundException
   {
diff --git a/libjava/java/io/PipedWriter.java b/libjava/java/io/PipedWriter.java
index ebcbde7..d5dd8bf 100644
--- a/libjava/java/io/PipedWriter.java
+++ b/libjava/java/io/PipedWriter.java
@@ -104,9 +104,9 @@ public class PipedWriter extends Writer
     * @exception IOException If the stream has not been connected or has
     *                        been closed.
     */  
-  public void write(char b) throws IOException
+  public void write(int b) throws IOException
   {
-    read_buf[0] = b;
+    read_buf[0] = (char) (b & 0xffff);
     sink.receive (read_buf, 0, 1);
   }