summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2002-02-09 14:36:41 +0000
committerMark Wielaard <mark@klomp.org>2002-02-09 14:36:41 +0000
commit0aa4fcfb7f017bdf5250dceb4b80b9b53abba3e0 (patch)
treea00242aa3908de2c86efd48eb495075673b67695
parent49d748fa2e34eeac35ec5ca5180284fe09b10fc1 (diff)
downloadclasspath-0aa4fcfb7f017bdf5250dceb4b80b9b53abba3e0.tar.gz
Thanks to Takashi Okamoto
* java/util/Arrays.java (ArrayList.indexOf()): this.equals(). * java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise. * java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().
-rw-r--r--ChangeLog7
-rw-r--r--java/util/Arrays.java6
-rw-r--r--java/util/WeakHashMap.java4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3469ad437..a3a08d0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-09 Mark Wielaard <mark@klomp.org>
+
+ Thanks to Takashi Okamoto
+ * java/util/Arrays.java (ArrayList.indexOf()): this.equals().
+ * java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise.
+ * java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().
+
2002-02-07 Mark Wielaard <mark@klomp.org>
* gnu/java/io/encode/Encoder8859_1.java (static): explicitly mention
diff --git a/java/util/Arrays.java b/java/util/Arrays.java
index 128550102..13f9be0c9 100644
--- a/java/util/Arrays.java
+++ b/java/util/Arrays.java
@@ -1,5 +1,5 @@
/* Arrays.java -- Utility class with methods to operate on arrays
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -2430,7 +2430,7 @@ public class Arrays
{
int size = a.length;
for (int i = 0; i < size; i++)
- if (equals(o, a[i]))
+ if (this.equals(o, a[i]))
return i;
return -1;
}
@@ -2439,7 +2439,7 @@ public class Arrays
{
int i = a.length;
while (--i >= 0)
- if (equals(o, a[i]))
+ if (this.equals(o, a[i]))
return i;
return -1;
}
diff --git a/java/util/WeakHashMap.java b/java/util/WeakHashMap.java
index d86ec2619..6965db1cc 100644
--- a/java/util/WeakHashMap.java
+++ b/java/util/WeakHashMap.java
@@ -1,6 +1,6 @@
/* java.util.WeakHashMap -- a hashtable that keeps only weak references
to its keys, allowing the virtual machine to reclaim them
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -483,7 +483,7 @@ public class WeakHashMap extends AbstractMap implements Map
*/
WeakEntry getEntry()
{
- final Object key = get();
+ final Object key = this.get();
if (key == null)
return null;
return new WeakEntry(key);