procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-01-07 Michael Koch <konqueror@gmx.de>

Browse source 
* 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
This commit is contained in:
Michael Koch 2004-01-07 18:40:08 +00:00 • committed by Michael Koch
parent 677e7ddcee
commit 9b773289f8
4 changed files with 57 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/java/text/CollationElementIterator.java
View file

@ -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;
}
}