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

libjava/ChangeLog

 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.

libjava/java/text/RuleBasedCollator.java

@@ -137,20 +137,21 @@ import java.util.Vector;
  * @date March 25, 1999
  */
 
-final class RBCElement
+public class RuleBasedCollator extends Collator
 {
-  String key;
-  char relation;
-
-  RBCElement (String key, char relation)
+  final class CollationElement
   {
-    this.key = key;
-    this.relation = relation;
-  }
-}
+    String key;
+    char relation;
+
+    CollationElement (String key, char relation)
+    {
+      this.key = key;
+      this.relation = relation;
+    }
+
+  } // inner class CollationElement
 
-public class RuleBasedCollator extends Collator
-{
   // 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 '<':