* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45337
138bc75d-0d04-0410-961f-
82ee72b054a4
2001-08-31 Tom Tromey <tromey@redhat.com>
+ 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.
+
* Makefile.in: Rebuilt.
* Makefile.am (ordinary_java_source_files): Removed
EnumerationChain, added DoubleEnumeration.
}
/** @since 1.2 */
- public File getAbsoluteFile () throws IOException
+ public File getAbsoluteFile ()
{
return new File (getAbsolutePath());
}
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
{
* @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);
}
/* Comparator.java -- Interface for objects that specify an ordering
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* compared by this ordering.
*/
int compare(Object o1, Object o2);
+
+ /**
+ * Return true if the object is equal to this object. To be
+ * considered equal, the argument object must satisfy the constraints
+ * of <code>Object.equals()</code>, be a Comparator, and impose the
+ * same ordering as this Comparator.
+ * @param obj The object
+ */
+ boolean equals(Object obj);
}