CollationElementIterator.java, [...]: New versions from GNU classpath.
2004-06-01 Michael Koch <konqueror@gmx.de> * java/text/CollationElementIterator.java, java/text/CollationKey.java, java/text/RuleBasedCollator.java: New versions from GNU classpath. * testsuite/libjava.mauve/xfails: Removed all java.text.CollationElementIterator tests. From-SVN: r82510
This commit is contained in:
parent
f7dbd56c9a
commit
57807c3178
5 changed files with 943 additions and 387 deletions
libjava/java/text
|
@ -78,24 +78,13 @@ public final class CollationKey implements Comparable
|
|||
/**
|
||||
* This is the bit value for this key.
|
||||
*/
|
||||
private int[] key;
|
||||
private byte[] key;
|
||||
|
||||
CollationKey(Collator collator, CollationElementIterator iter,
|
||||
String originalText, int strength)
|
||||
CollationKey (Collator collator, String originalText, byte[] key)
|
||||
{
|
||||
this.collator = collator;
|
||||
this.originalText = originalText;
|
||||
|
||||
// Compute size of required array.
|
||||
int size = 0;
|
||||
while (RuleBasedCollator.next(iter, strength)
|
||||
!= CollationElementIterator.NULLORDER)
|
||||
++size;
|
||||
|
||||
iter.reset();
|
||||
key = new int[size];
|
||||
for (int i = 0; i < size; i++)
|
||||
key[i] = RuleBasedCollator.next(iter, strength);
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -205,15 +194,6 @@ public final class CollationKey implements Comparable
|
|||
*/
|
||||
public byte[] toByteArray()
|
||||
{
|
||||
byte[] r = new byte[4 * key.length];
|
||||
int off = 0;
|
||||
for (int i = 0; i < key.length; ++i)
|
||||
{
|
||||
r[off++] = (byte) ((key[i] >>> 24) & 255);
|
||||
r[off++] = (byte) ((key[i] >>> 16) & 255);
|
||||
r[off++] = (byte) ((key[i] >>> 8) & 255);
|
||||
r[off++] = (byte) ((key[i] ) & 255);
|
||||
}
|
||||
return r;
|
||||
return key;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue