[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in File

[Kaffe CVS]

PatchSet 5445 
Date: 2004/11/11 03:11:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small cleanups in File

2004-11-11  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/File.java:
        Resynced with GNU Classpath.

        2004-11-09  Tom Tromey  <tromey at redhat.com>

        * java/io/File.java (directory.getName): Removed redundant cast.
        Changed mask to be of type long.

Members: 
	ChangeLog:1.2992->1.2993 
	libraries/javalib/java/io/File.java:1.56->1.57 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2992 kaffe/ChangeLog:1.2993
--- kaffe/ChangeLog:1.2992	Thu Nov 11 02:58:07 2004
+++ kaffe/ChangeLog	Thu Nov 11 03:11:23 2004
@@ -1,5 +1,15 @@
 2004-11-11  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/File.java:
+        Resynced with GNU Classpath.
+
+	2004-11-09  Tom Tromey  <tromey at redhat.com>
+
+        * java/io/File.java (directory.getName): Removed redundant cast.
+        Changed "mask" to be of type "long".
+
+2004-11-11  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/util/jar/JarFile.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/File.java
diff -u kaffe/libraries/javalib/java/io/File.java:1.56 kaffe/libraries/javalib/java/io/File.java:1.57
--- kaffe/libraries/javalib/java/io/File.java:1.56	Thu Nov 11 01:56:27 2004
+++ kaffe/libraries/javalib/java/io/File.java	Thu Nov 11 03:11:28 2004
@@ -1118,7 +1118,7 @@
         if (prefix.length() >= 8)
           throw new IllegalArgumentException("Prefix too long: " + prefix + "(valid length 3..7)");
 
-        int  mask = (int) (0x000000ffffFFFFL >> (long) (prefix.length() * 4));
+        long mask = 0x000000ffffFFFFL >> (prefix.length() * 4);
         do
           {
             int n = (int) (System.currentTimeMillis() & mask);