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

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

Browse source 
* java/text/RuleBasedCollator.java
	(RuleBasedCollator): Check rules not empty, fixed search in already
	existing collation elements.
	(is_special): Removed common whitespace characters.
	(text_argument): Dont return on whitespaces, add characters between
	two ' to string buffer.

From-SVN: r72716
This commit is contained in:
Michael Koch 2003-10-20 20:14:05 +00:00 • committed by Michael Koch
parent d15f01e3d9
commit c756026608
2 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

41
libjava/java/text/RuleBasedCollator.java
View file

@ -180,6 +180,9 @@ public class RuleBasedCollator extends Collator
*/
public RuleBasedCollator (String rules) throws ParseException
{
if (rules.equals (""))
throw new ParseException ("empty rule set", 0);
this.rules = rules;
this.frenchAccents = false;
@ -225,7 +228,19 @@ public class RuleBasedCollator extends Collator
if (argument.length() == 0)
throw new ParseException ("invalid character", save);
String arg = argument.toString();
int item_index = vec.indexOf(arg);
int item_index = -1;
for (int j = 0; j < vec.size(); ++j)
{
CollationElement e = (CollationElement) vec.elementAt (j);
if (arg.equals (e.key))
{
item_index = j;
break;
}
}
if (c != '&')
{
// If the argument already appears in the vector, then we
@ -535,8 +550,7 @@ public class RuleBasedCollator extends Collator
private final boolean is_special (char c)
{
// Rules from JCL book.
return ((c >= 0x0009 && c <= 0x000d)
|| (c >= 0x0020 && c <= 0x002f)
return ((c >= 0x0021 && c <= 0x002f)
|| (c >= 0x003a && c <= 0x0040)
|| (c >= 0x005b && c <= 0x0060)
|| (c >= 0x007b && c <= 0x007e));
@ -549,15 +563,20 @@ public class RuleBasedCollator extends Collator
int len = rules.length();
while (index < len)
{
char c = rules.charAt(index);
if (c == '\'' && index + 2 < len
&& rules.charAt(index + 2) == '\''
&& is_special (rules.charAt(index + 1)))
index += 2;
else if (is_special (c) || Character.isWhitespace(c))
char c = rules.charAt (index);
if (c == '\''
&& index + 2 < len
&& rules.charAt (index + 2) == '\'')
{
result.append (rules.charAt (index + 1));
index += 2;
}
else if (is_special (c))
return index;
result.append(c);
++index;
else if (!Character.isWhitespace (c))
result.append (c);
++index;
}
return index;
}