This patch (committed) fixes a couple more problems in attributed text classes:
2006-09-11 David Gilbert <[EMAIL PROTECTED]>
* java/text/AttributedCharacterIterator.java
(LANGUAGE): Initialise with lower case string,
(INPUT_METHOD_SEGMENT): Likewise,
(READING): Likewise,
* java/text/AttributedStringIterator.java
(getRunLimit): Check all attributes for changes.
I'll commit the relevant Mauve tests shortly.
Regards,
Dave
Index: java/text/AttributedCharacterIterator.java
===================================================================
RCS file:
/sources/classpath/classpath/java/text/AttributedCharacterIterator.java,v
retrieving revision 1.15
diff -u -r1.15 AttributedCharacterIterator.java
--- java/text/AttributedCharacterIterator.java 11 Sep 2006 13:08:03 -0000
1.15
+++ java/text/AttributedCharacterIterator.java 11 Sep 2006 13:54:19 -0000
@@ -70,7 +70,7 @@
* This is the attribute for the language of the text. The value of
* attributes of this key type are instances of <code>Locale</code>.
*/
- public static final Attribute LANGUAGE = new Attribute("LANGUAGE");
+ public static final Attribute LANGUAGE = new Attribute("language");
/**
* This is the attribute for the reading form of text. This is used
@@ -79,7 +79,7 @@
* instances of <code>Annotation</code> which wrappers a
* <code>String</code>.
*/
- public static final Attribute READING = new Attribute("READING");
+ public static final Attribute READING = new Attribute("reading");
/**
* This is the attribute for input method segments. The value of
attributes
@@ -87,7 +87,7 @@
* a <code>String</code>.
*/
public static final Attribute INPUT_METHOD_SEGMENT =
- new Attribute("INPUT_METHOD_SEGMENT");
+ new Attribute("input_method_segment");
/**
* The name of the attribute key
Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /sources/classpath/classpath/java/text/AttributedStringIterator.java,v
retrieving revision 1.13
diff -u -r1.13 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java 11 Sep 2006 13:08:03 -0000
1.13
+++ java/text/AttributedStringIterator.java 11 Sep 2006 13:54:20 -0000
@@ -187,7 +187,7 @@
public int getRunLimit()
{
- return(getRunLimit(getAttributes().keySet()));
+ return getRunLimit(getAllAttributeKeys());
}
public int getRunLimit(AttributedCharacterIterator.Attribute attrib)
