aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-06-19 15:13:31 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-06-19 15:13:31 +0000
commit2e5d98ced6c38eb3dd1790b263af057fac64314d (patch)
treed28fd04a15a9f13cb71c04e947302fe61021c98a /libjava
parenta05f6447e30beccc4271606dff8dc1138a6b9a72 (diff)
downloadgcc-2e5d98ced6c38eb3dd1790b263af057fac64314d.zip
gcc-2e5d98ced6c38eb3dd1790b263af057fac64314d.tar.gz
gcc-2e5d98ced6c38eb3dd1790b263af057fac64314d.tar.bz2
2003-06-19 Michael Koch <konqueror@gmx.de>
* java/text/CollationElementIterator.java (NULLORDER): Initialize with -1 as JDK documentation says. From-SVN: r68199
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/text/CollationElementIterator.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 245e855..d85f3a3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2003-06-19 Michael Koch <konqueror@gmx.de>
+ * java/text/CollationElementIterator.java
+ (NULLORDER): Initialize with -1 as JDK documentation says.
+
+2003-06-19 Michael Koch <konqueror@gmx.de>
+
* java/net/HttpURLConnection.java,
java/net/Inet4Address.java,
java/net/Inet6Address.java,
diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java
index ba60f20..94c6500 100644
--- a/libjava/java/text/CollationElementIterator.java
+++ b/libjava/java/text/CollationElementIterator.java
@@ -1,6 +1,6 @@
/* CollationElementIterator.java -- Walks through collation elements
+ Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation
-/* Copyright (C) 1999, 2001 Free Software Foundation
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@ public final class CollationElementIterator
* This is a constant value that is returned to indicate that the end of
* the string was encountered.
*/
- public static final int NULLORDER = 0xffffffff;
+ public static final int NULLORDER = -1;
/**
* This is the RuleBasedCollator this object was created from.
@@ -92,6 +92,7 @@ public final class CollationElementIterator
{
if (index == text.length())
return NULLORDER;
+
return collator.ceiNext(this);
}