* Patch: FYI: File -vs- Comparable
@ 2007-07-16 4:59 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2007-07-16 4:59 UTC (permalink / raw)
To: GCJ-patches
I'm checking this in.
It came to my attention the other day that File should implement
Comparable<File>, not just Comparable. This is already the case in
Classpath but the change was never merged.
Tom
2007-07-15 Tom Tromey <tromey@redhat.com>
* java/io/File.java: Implement Comparable<File>.
(compareTo): Removed.
* java/io/File.h: Rebuilt.
* classpath/lib/java/io/File.class: Rebuilt.
Index: java/io/File.java
===================================================================
--- java/io/File.java (revision 126662)
+++ java/io/File.java (working copy)
@@ -1,5 +1,5 @@
/* File.java -- Class representing a file on disk
- Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+ Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,7 +59,7 @@
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Tom Tromey (tromey@cygnus.com)
*/
-public class File implements Serializable, Comparable
+public class File implements Serializable, Comparable<File>
{
private static final long serialVersionUID = 301077366599181567L;
@@ -103,7 +103,7 @@
/**
* This is the string that is used to separate the host name from the
- * path name in paths than include the host name. It is the value of
+ * path name in paths that include the host name. It is the value of
* the <code>path.separator</code> system property.
*/
public static final String pathSeparator
@@ -454,7 +454,8 @@
* This method initializes a new <code>File</code> object to represent
* a file corresponding to the specified <code>file:</code> protocol URI.
*
- * @param uri The uri.
+ * @param uri The URI
+ * @throws IllegalArgumentException if the URI is not hierarchical
*/
public File(URI uri)
{
@@ -605,7 +606,8 @@
/**
* This method returns a <code>String</code> the represents this file's
* parent. <code>null</code> is returned if the file has no parent. The
- * parent is determined via a simple operation which removes the
+ * parent is determined via a simple operation which removes the name
+ * after the last file separator character, as determined by the platform.
*
* @return The parent directory of this file
*/
@@ -1445,32 +1447,6 @@
return path.compareToIgnoreCase (other.path);
}
- /**
- * This method compares the specified <code>Object</code> to this one
- * to test for equality. It does this by comparing the canonical path names
- * of the files. This method is identical to <code>compareTo(File)</code>
- * except that if the <code>Object</code> passed to it is not a
- * <code>File</code>, it throws a <code>ClassCastException</code>
- * <p>
- * The canonical paths of the files are determined by calling the
- * <code>getCanonicalPath</code> method on each object.
- * <p>
- * This method returns a 0 if the specified <code>Object</code> is equal
- * to this one, a negative value if it is less than this one
- * a positive value if it is greater than this one.
- *
- * @return An integer as described above
- *
- * @exception ClassCastException If the passed <code>Object</code> is
- * not a <code>File</code>
- *
- * @since 1.2
- */
- public int compareTo(Object obj)
- {
- return compareTo((File) obj);
- }
-
/*
* This native method actually performs the rename.
*/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-07-16 4:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-16 4:59 Patch: FYI: File -vs- Comparable Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).