diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-15 15:13:03 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-15 15:13:03 +0000 |
| commit | dab277bd8041bd87c91929aeb9381794b1f009cf (patch) | |
| tree | 20d82c2ff4c37790d7175ca5b1cf18a53b19aecc | |
| parent | 5daa75180b41b455bae3333909ccfae4396728d4 (diff) | |
| download | gcc-dab277bd8041bd87c91929aeb9381794b1f009cf.tar.gz | |
2003-10-15 Michael Koch <konqueror@gmx.de>
* java/text/RuleBasedCollator.java
(CollationElement): Renamed from RBCElement and moved into
RuledBasedCollator as inner class.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72525 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/text/RuleBasedCollator.java | 27 |
2 files changed, 20 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0b188193f2c..0117684f141 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java index 2db63881ce2..a23abe29fad 100644 --- a/libjava/java/text/RuleBasedCollator.java +++ b/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 '<': |