From fac9986f014c807407242c154bf6051be4bea4a2 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 16 Jul 2007 05:00:28 +0000 Subject: * java/io/File.java: Implement Comparable. (compareTo): Removed. * java/io/File.h: Rebuilt. * classpath/lib/java/io/File.class: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126670 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/File.h | 6 ++++-- libjava/java/io/File.java | 38 +++++++------------------------------- 2 files changed, 11 insertions(+), 33 deletions(-) (limited to 'libjava/java/io') diff --git a/libjava/java/io/File.h b/libjava/java/io/File.h index 92cfbb7e1db..b53f6ab7d02 100644 --- a/libjava/java/io/File.h +++ b/libjava/java/io/File.h @@ -111,8 +111,7 @@ private: public: static JArray< ::java::io::File * > * listRoots(); static ::java::io::File * createTempFile(::java::lang::String *, ::java::lang::String *); - virtual jint compareTo(::java::io::File *); - virtual jint compareTo(::java::lang::Object *); + virtual jint File$compareTo(::java::io::File *); private: jboolean performRenameTo(::java::io::File *); public: @@ -130,6 +129,9 @@ public: private: void writeObject(::java::io::ObjectOutputStream *); void readObject(::java::io::ObjectInputStream *); +public: + virtual jint compareTo(::java::lang::Object *); +private: static const jlong serialVersionUID = 301077366599181567LL; static const jint READ = 0; static const jint WRITE = 1; diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 0026ffaeedf..67d1b96df6c 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -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 @@ import gnu.classpath.Configuration; * @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 { private static final long serialVersionUID = 301077366599181567L; @@ -103,7 +103,7 @@ public class File implements Serializable, Comparable /** * 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 path.separator system property. */ public static final String pathSeparator @@ -454,7 +454,8 @@ public class File implements Serializable, Comparable * This method initializes a new File object to represent * a file corresponding to the specified file: 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 @@ public class File implements Serializable, Comparable /** * This method returns a String the represents this file's * parent. null 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 @@ public class File implements Serializable, Comparable return path.compareToIgnoreCase (other.path); } - /** - * This method compares the specified Object to this one - * to test for equality. It does this by comparing the canonical path names - * of the files. This method is identical to compareTo(File) - * except that if the Object passed to it is not a - * File, it throws a ClassCastException - *

- * The canonical paths of the files are determined by calling the - * getCanonicalPath method on each object. - *

- * This method returns a 0 if the specified Object 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 Object is - * not a File - * - * @since 1.2 - */ - public int compareTo(Object obj) - { - return compareTo((File) obj); - } - /* * This native method actually performs the rename. */ -- cgit v1.2.1