Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 CollationElementIterator.java
--- java/text/CollationElementIterator.java	7 Jan 2004 09:26:33 -0000	1.13
+++ java/text/CollationElementIterator.java	8 Jan 2004 08:29:58 -0000
@@ -1,5 +1,5 @@
 /* CollationElementIterator.java -- Walks through collation elements
-   Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -300,7 +300,8 @@
    * to the <code>String</code> represented by the specified
    * <code>CharacterIterator</code>.
    *
-   * @param ci The <code>CharacterIterator</code> containing the new <code>String</code> to iterate over.
+   * @param source The <code>CharacterIterator</code> containing the new
+   * <code>String</code> to iterate over.
    */
   public void setText(CharacterIterator source)
   {
Index: java/text/CollationKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationKey.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 CollationKey.java
--- java/text/CollationKey.java	7 Jan 2004 09:26:34 -0000	1.10
+++ java/text/CollationKey.java	8 Jan 2004 08:29:58 -0000
@@ -148,7 +148,7 @@
 
     CollationKey ck = (CollationKey) obj;
 
-    if (!ck.collator.equals (collator))
+    if (ck.collator != collator)
       return false;
 
     if (!ck.getSourceString ().equals (getSourceString ()))