diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-01-07 18:40:08 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-01-07 18:40:08 +0000 |
| commit | 9b773289f883bc57491f8254e7ece335ae948f7e (patch) | |
| tree | 195faa2550e69c0ed1060d2bf90a2b1c688588a5 /libjava/java/text/CollationElementIterator.java | |
| parent | 677e7ddceed691a4453804e97bb9733e53d4ea4d (diff) | |
2004-01-07 Michael Koch <konqueror@gmx.de>
* 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
Diffstat (limited to 'libjava/java/text/CollationElementIterator.java')
| -rw-r--r-- | libjava/java/text/CollationElementIterator.java | 10 |
1 files changed, 5 insertions, 5 deletions
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; } } |