OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* java/text/RuleBasedCollator.java
	(CollationElement): Renamed from RBCElement and moved into
	RuledBasedCollator as inner class.

From-SVN: r72525
This commit is contained in:
Michael Koch 2003-10-15 15:13:03 +00:00 committed by Michael Koch
parent 12dc3f75be
commit 684cab7dbf
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2003-10-15 Michael Koch <konqueror@gmx.de>
* java/text/RuleBasedCollator.java
(CollationElement): Renamed from RBCElement and moved into
RuledBasedCollator as inner class.
2003-10-15 Michael Koch <konqueror@gmx.de>
* java/text/CollationElementIterator.java

29
libjava/java/text/RuleBasedCollator.java
View File

@ -137,20 +137,21 @@ import java.util.Vector;
* @date March 25, 1999
*/
final class RBCElement
{
String key;
char relation;
RBCElement (String key, char relation)
{
this.key = key;
this.relation = relation;
}
}
public class RuleBasedCollator extends Collator
{
final class CollationElement
{
String key;
char relation;
CollationElement (String key, char relation)
{
this.key = key;
this.relation = relation;
}
} // inner class CollationElement
// True if we are using French-style accent ordering.
private boolean frenchAccents;
@ -426,7 +427,7 @@ public class RuleBasedCollator extends Collator
if (insertion_index >= item_index)
--insertion_index;
}
RBCElement r = new RBCElement (arg, c);
CollationElement r = new CollationElement (arg, c);
vec.insertElementAt(r, insertion_index);
++insertion_index;
}
@ -456,7 +457,7 @@ public class RuleBasedCollator extends Collator
Enumeration e = vec.elements();
while (e.hasMoreElements())
{
RBCElement r = (RBCElement) e.nextElement();
CollationElement r = (CollationElement) e.nextElement();
switch (r.relation)
{
case '<':