From 3831381763ca5f41d6f7406d590e1e38a8531e1c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 18 Jun 2002 15:40:16 +0000 Subject: javaprims.h: Updated class declaration list. * gcj/javaprims.h: Updated class declaration list. * Makefile.in: Rebuilt. * Makefile.am (core_java_source_files): Added PropertyPermissionCollection.java. * java/lang/Thread.java (group, name): Now package-private. * java/lang/ThreadGroup.java: Re-merge with Classpath. * java/util/AbstractList.java: Likewise. * java/util/AbstractMap.java: Likewise. * java/util/Calendar.java: Likewise. * java/util/Collections.java: Likewise. * java/util/HashMap.java: Likewise. * java/util/Hashtable.java: Likewise. * java/util/LinkedHashMap.java: Likewise. * java/util/LinkedList.java: Likewise. * java/util/List.java: Likewise. * java/util/ListResourceBundle.java: Likewise. * java/util/Map.java: Likewise. * java/util/Observable.java: Likewise. * java/util/Properties.java: Likewise. * java/util/PropertyPermission.java: Likewise. * java/util/PropertyPermissionCollection.java: Likewise. * java/util/PropertyResourceBundle.java: Likewise. * java/util/Random.java: Likewise. * java/util/SimpleTimeZone.java: Likewise. * java/util/StringTokenizer.java: Likewise. * java/util/TimerTask.java: Likewise. * java/util/TreeMap.java: Likewise. * java/util/WeakHashMap.java: Likewise. * java/util/jar/Attributes.java: Likewise. * java/util/jar/JarException.java: Likewise. * java/util/jar/Manifest.java: Likewise. From-SVN: r54743 --- libjava/java/util/Map.java | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'libjava/java/util/Map.java') diff --git a/libjava/java/util/Map.java b/libjava/java/util/Map.java index 5918a41..01f9b23 100644 --- a/libjava/java/util/Map.java +++ b/libjava/java/util/Map.java @@ -296,14 +296,14 @@ public interface Map */ public Object setValue(Object value); + /** - * Returns the hash code of the entry. This is defined as the exclusive-or - * of the hashcodes of the key and value (using 0 for null). In other - * words, this must be: - *
-     *  (getKey() == null ? 0 : getKey().hashCode()) ^
-     *  (getValue() == null ? 0 : getValue().hashCode())
-     * 
+ * Returns the hash code of the entry. This is defined as the + * exclusive-or of the hashcodes of the key and value (using 0 for + * null). In other words, this must be: + * +

(getKey() == null ? 0 : getKey().hashCode())
+^ (getValue() == null ? 0 : getValue().hashCode())
* * @return the hash code */ @@ -313,16 +313,16 @@ public interface Map * Compares the specified object with this entry. Returns true only if * the object is a mapping of identical key and value. In other words, * this must be: - *
-     * (o instanceof Map.Entry)
-     * && (getKey() == null ? ((HashMap) o).getKey() == null
-     *                      : getKey().equals(((HashMap) o).getKey()))
-     * && (getValue() == null ? ((HashMap) o).getValue() == null
-     *                        : getValue().equals(((HashMap) o).getValue()))
-     * 
+ * +

(o instanceof Map.Entry)
+&& (getKey() == null ? ((HashMap) o).getKey() == null
+                     : getKey().equals(((HashMap) o).getKey()))
+&& (getValue() == null ? ((HashMap) o).getValue() == null
+                       : getValue().equals(((HashMap) o).getValue()))
* * @param o the object to compare - * @return true if it is equal + * + * @return true if it is equal */ public boolean equals(Object o); } -- cgit v1.1