This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.text.RuleBasedCollator
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 15 Oct 2003 17:21:29 +0200
- Subject: FYI: Patch: java.text.RuleBasedCollator
Hi list,
I commited the attached patch to trunk to moved the class RBCElement into
RuleBasedCollator and renamed it to CollationElement. This merges it partly
with classpath.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2271
diff -u -b -B -r1.2271 ChangeLog
--- ChangeLog 15 Oct 2003 14:49:27 -0000 1.2271
+++ ChangeLog 15 Oct 2003 15:12:40 -0000
@@ -1,5 +1,11 @@
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
(CollationElementIterator): Moved, documenatation added, call setText.
(next): Reformated.
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/RuleBasedCollator.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java 19 May 2003 09:09:23 -0000 1.9
+++ java/text/RuleBasedCollator.java 15 Oct 2003 15:12:40 -0000
@@ -137,20 +137,21 @@
* @date March 25, 1999
*/
-final class RBCElement
+public class RuleBasedCollator extends Collator
{
+ final class CollationElement
+ {
String key;
char relation;
- RBCElement (String key, char relation)
+ CollationElement (String key, char relation)
{
this.key = key;
this.relation = relation;
}
-}
-public class RuleBasedCollator extends Collator
-{
+ } // inner class CollationElement
+
// True if we are using French-style accent ordering.
private boolean frenchAccents;
@@ -426,7 +427,7 @@
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 @@
Enumeration e = vec.elements();
while (e.hasMoreElements())
{
- RBCElement r = (RBCElement) e.nextElement();
+ CollationElement r = (CollationElement) e.nextElement();
switch (r.relation)
{
case '<':