2003-10-15 Michael Koch <konqueror@gmx.de>

	* java/text/CollationElementIterator.java
	(CollationElementIterator): Moved, documenatation added, call setText.
	(next): Reformated.
	(reset): Reformated.
	(setText): New method.
	(getOffset): New method.
	* java/text/CollationKey.java
	(getSourceString): Reformated.
	(hashCode): Reformated.
	(toByteArray): Reformated.

From-SVN: r72523

2 files changed, 42 insertions, 9 deletions

diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java
index 94c6500..9eb17a5 100644
--- a/libjava/java/text/CollationElementIterator.java
+++ b/libjava/java/text/CollationElementIterator.java
@@ -82,18 +82,32 @@ public final class CollationElementIterator
   int lookahead;
 
   /**
+   * This method initializes a new instance of <code>CollationElementIterator</code>
+   * to iterate over the specified <code>String</code> using the rules in the
+   * specified <code>RuleBasedCollator</code>.
+   *
+   * @param collator The <code>RuleBasedCollation</code> used for calculating collation values
+   * @param text The <code>String</code> to iterate over.
+   */
+  CollationElementIterator (String text, RuleBasedCollator collator)
+  {
+    setText (text);
+    this.collator = collator;
+  }
+
+  /**
    * This method returns the collation ordering value of the next character
    * in the string.  This method will return <code>NULLORDER</code> if the
    * end of the string was reached.
    *
    * @return The collation ordering value.
    */
-  public int next ()
+  public int next()
   {
     if (index == text.length())
       return NULLORDER;
 
-    return collator.ceiNext(this);
+    return collator.ceiNext (this);
   }
 
   /**
@@ -114,7 +128,7 @@ public final class CollationElementIterator
    * This method resets the internal position pointer to read from the
    * beginning of the <code>String again.
    */
-  public void reset ()
+  public void reset()
   {
     index = 0;
   }
@@ -147,14 +161,33 @@ public final class CollationElementIterator
     return (short) (order & 255);
   }
 
-  // Non-public constructor.
-  CollationElementIterator (String text, RuleBasedCollator collator)
+  /**
+   * This method sets the <code>String</code> that it is iterating over
+   * to the specified <code>String</code>.
+   *
+   * @param text The new <code>String</code> to iterate over.
+   *
+   * @since 1.2
+   */
+  public void setText (String text)
   {
     this.text = text;
     this.index = 0;
     this.lookahead_set = false;
     this.lookahead = 0;
-    this.collator = collator;
+  }
+
+  /**
+   * This method returns the current offset into the <code>String</code>
+   * that is being iterated over.
+   *
+   * @return The iteration index position.
+   *
+   * @since 1.2
+   */
+  public int getOffset()
+  {
+    return index;
   }
 
 } // class CollationElementIterator
diff --git a/libjava/java/text/CollationKey.java b/libjava/java/text/CollationKey.java
index 9517756..f7e3148 100644
--- a/libjava/java/text/CollationKey.java
+++ b/libjava/java/text/CollationKey.java
@@ -169,7 +169,7 @@ public final class CollationKey implements Comparable
    *
    * @return The source <code>String</code> for this object.
    */
-  public String getSourceString ()
+  public String getSourceString()
   {
     return originalText;
   }
@@ -181,7 +181,7 @@ public final class CollationKey implements Comparable
    *
    * @return A hash value for this object.
    */
-  public int hashCode ()
+  public int hashCode()
   {
     // We just follow BitSet instead of thinking up something new.
     long h = originalText.hashCode();
@@ -195,7 +195,7 @@ public final class CollationKey implements Comparable
    *
    * @param A byte array containing the collation bit sequence.
    */
-  public byte[] toByteArray ()
+  public byte[] toByteArray()
   {
     byte[] r = new byte[4 * key.length];
     int off = 0;