PatchSet 4319
Date: 2004/01/11 19:43:48
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath
2004-01-11 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2004-01-08 Michael Koch <[EMAIL PROTECTED]>
* java/text/CollationKey.java
(equals): Directly compare parent collators.
2004-01-07 Michael Koch <[EMAIL PROTECTED]>
* java/text/CollationKey.java
(hashCode): Reimplemented.
Members:
ChangeLog:1.1906->1.1907
libraries/javalib/java/text/CollationKey.java:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1906 kaffe/ChangeLog:1.1907
--- kaffe/ChangeLog:1.1906 Sun Jan 11 19:36:22 2004
+++ kaffe/ChangeLog Sun Jan 11 19:43:48 2004
@@ -4,6 +4,20 @@
2004-01-08 Michael Koch <[EMAIL PROTECTED]>
+ * java/text/CollationKey.java
+ (equals): Directly compare parent collators.
+
+ 2004-01-07 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/text/CollationKey.java
+ (hashCode): Reimplemented.
+
+2004-01-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
+ 2004-01-08 Michael Koch <[EMAIL PROTECTED]>
+
* java/text/CollationElementIterator.java
(setText): Fixed argument name in documentation.
Index: kaffe/libraries/javalib/java/text/CollationKey.java
diff -u kaffe/libraries/javalib/java/text/CollationKey.java:1.14
kaffe/libraries/javalib/java/text/CollationKey.java:1.15
--- kaffe/libraries/javalib/java/text/CollationKey.java:1.14 Sat Nov 22 18:50:17
2003
+++ kaffe/libraries/javalib/java/text/CollationKey.java Sun Jan 11 19:43:50 2004
@@ -148,7 +148,7 @@
CollationKey ck = (CollationKey) obj;
- if (!ck.collator.equals (collator))
+ if (ck.collator != collator)
return false;
if (!ck.getSourceString ().equals (getSourceString ()))
@@ -180,7 +180,11 @@
*/
public int hashCode()
{
- return key.hashCode();
+ // We just follow BitSet instead of thinking up something new.
+ long h = originalText.hashCode();
+ for (int i = key.length - 1; i >= 0; --i)
+ h ^= key[i] * (i + 1);
+ return (int) ((h >> 32) ^ h);
}
/**
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
