From 9b773289f883bc57491f8254e7ece335ae948f7e Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 7 Jan 2004 18:40:08 +0000 Subject: 2004-01-07 Michael Koch * java/text/CollationElementIterator.java (textIndex): Renamed from index. * java/text/CollationKey.java (collator): New member. (CollationKey): New argument for parent collator. (equals): Check for same collator, source string and key array. * java/text/RuleBasedCollator.java: Reformated. (RuleBasedCollator): Don't re-initialize frenchAccents with default value. (getCollationElementIterator): Rewritten. (getCollationKey): Added new argument to CollationKey constructor. From-SVN: r75510 --- libjava/java/text/CollationElementIterator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/java/text/CollationElementIterator.java') diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index bcb4f6b89c2..ecc95231d30 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -76,7 +76,7 @@ public final class CollationElementIterator /** * This is the index into the String where we are currently scanning. */ - int index; + int textIndex; // A piece of lookahead. boolean lookahead_set; @@ -107,7 +107,7 @@ public final class CollationElementIterator */ public int next() { - if (index == text.length()) + if (textIndex == text.length()) return NULLORDER; return collator.ceiNext (this); @@ -133,7 +133,7 @@ public final class CollationElementIterator */ public void reset() { - index = 0; + textIndex = 0; } /** @@ -175,7 +175,7 @@ public final class CollationElementIterator public void setText(String text) { this.text = text; - this.index = 0; + this.textIndex = 0; this.lookahead_set = false; this.lookahead = 0; } @@ -190,6 +190,6 @@ public final class CollationElementIterator */ public int getOffset() { - return index; + return textIndex; } } -- cgit v1.2.3