From 5f383ba58b019dfcf2b3ab0872bcf19f9b3a317b Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 6 Jan 2004 20:19:31 +0000 Subject: CollationElementIterator.java: Reformated. 2004-01-06 Michael Koch * java/text/CollationElementIterator.java: Reformated. (CollationElementIterator): Changed order of arguments. * java/text/RuleBasedCollator.java (RuleBasedCollator): Merged class documentation. (CollationElement): Added documentation. (compare): Reformated, renamed arguments. (equals): Likewise. (getCollationElementIterator): Likewise. (getCollationKey): Likewise. From-SVN: r75484 --- libjava/java/text/CollationElementIterator.java | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'libjava/java/text/CollationElementIterator.java') diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index 9eb17a50148..bcb4f6b89c2 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -53,6 +53,7 @@ package java.text; * * @author Aaron M. Renn * @author Tom Tromey + * @author Guilhem Lavaux */ public final class CollationElementIterator { @@ -89,15 +90,17 @@ public final class CollationElementIterator * @param collator The RuleBasedCollation used for calculating collation values * @param text The String to iterate over. */ - CollationElementIterator (String text, RuleBasedCollator collator) + CollationElementIterator(RuleBasedCollator collator, String text) { - setText (text); this.collator = collator; + + setText (text); } /** - * This method returns the collation ordering value of the next character - * in the string. This method will return NULLORDER if the + * This method returns the collation ordering value of the next character sequence + * in the string (it may be an extended character following collation rules). + * This method will return NULLORDER if the * end of the string was reached. * * @return The collation ordering value. @@ -118,7 +121,7 @@ public final class CollationElementIterator * * @return The primary order value of the specified collation value. This is the high 16 bits. */ - public static final int primaryOrder (int order) + public static final int primaryOrder(int order) { // From the JDK 1.2 spec. return order >>> 16; @@ -141,7 +144,7 @@ public final class CollationElementIterator * * @return The secondary order value of the specified collation value. This is the bits 8-15. */ - public static final short secondaryOrder (int order) + public static final short secondaryOrder(int order) { // From the JDK 1.2 spec. return (short) ((order >>> 8) & 255); @@ -155,7 +158,7 @@ public final class CollationElementIterator * * @return The tertiary order value of the specified collation value. This is the low eight bits. */ - public static final short tertiaryOrder (int order) + public static final short tertiaryOrder(int order) { // From the JDK 1.2 spec. return (short) (order & 255); @@ -169,7 +172,7 @@ public final class CollationElementIterator * * @since 1.2 */ - public void setText (String text) + public void setText(String text) { this.text = text; this.index = 0; @@ -189,6 +192,4 @@ public final class CollationElementIterator { return index; } - -} // class CollationElementIterator - +} -- cgit v1.2.3