diff options
Diffstat (limited to 'libjava/gnu/java/text')
| -rw-r--r-- | libjava/gnu/java/text/AttributedFormatBuffer.h | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/text/FormatBuffer.h | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/text/FormatCharacterIterator.h | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/text/StringFormatBuffer.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libjava/gnu/java/text/AttributedFormatBuffer.h b/libjava/gnu/java/text/AttributedFormatBuffer.h index 382afe1a3de..34293914988 100644 --- a/libjava/gnu/java/text/AttributedFormatBuffer.h +++ b/libjava/gnu/java/text/AttributedFormatBuffer.h @@ -46,7 +46,7 @@ private: public: virtual void append(::java::lang::String *); virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *); - virtual void append(::java::lang::String *, JArray< jint > *, JArray< ::java::util::HashMap * > *); + virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *); virtual void append(jchar); virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *); virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *); @@ -57,13 +57,13 @@ public: virtual void sync(); virtual ::gnu::java::lang::CPStringBuilder * getBuffer(); virtual JArray< jint > * getRanges(); - virtual JArray< ::java::util::HashMap * > * getAttributes(); + virtual ::java::util::List * getAttributes(); private: ::gnu::java::lang::CPStringBuilder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer; ::java::util::ArrayList * ranges; ::java::util::ArrayList * attributes; - JArray< jint > * a_ranges; - JArray< ::java::util::HashMap * > * a_attributes; + JArray< jint > * aRanges; + ::java::util::List * aAttributes; jint startingRange; public: // actually package-private ::java::text::AttributedCharacterIterator$Attribute * defaultAttr; diff --git a/libjava/gnu/java/text/FormatBuffer.h b/libjava/gnu/java/text/FormatBuffer.h index 267cf6fb013..14fcd5a8c2e 100644 --- a/libjava/gnu/java/text/FormatBuffer.h +++ b/libjava/gnu/java/text/FormatBuffer.h @@ -36,7 +36,7 @@ class gnu::java::text::FormatBuffer : public ::java::lang::Object public: virtual void append(::java::lang::String *) = 0; virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *) = 0; - virtual void append(::java::lang::String *, JArray< jint > *, JArray< ::java::util::HashMap * > *) = 0; + virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *) = 0; virtual void append(jchar) = 0; virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *) = 0; virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *) = 0; diff --git a/libjava/gnu/java/text/FormatCharacterIterator.h b/libjava/gnu/java/text/FormatCharacterIterator.h index 82c7fa02e4d..dcb68382297 100644 --- a/libjava/gnu/java/text/FormatCharacterIterator.h +++ b/libjava/gnu/java/text/FormatCharacterIterator.h @@ -36,7 +36,7 @@ class gnu::java::text::FormatCharacterIterator : public ::java::lang::Object public: FormatCharacterIterator(); - FormatCharacterIterator(::java::lang::String *, JArray< jint > *, JArray< ::java::util::HashMap * > *); + FormatCharacterIterator(::java::lang::String *, JArray< jint > *, ::java::util::List *); virtual ::java::util::Set * getAllAttributeKeys(); virtual ::java::util::Map * getAttributes(); virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *); @@ -56,11 +56,11 @@ public: virtual jchar next(); virtual jchar previous(); virtual jchar setIndex(jint); - virtual void mergeAttributes(JArray< ::java::util::HashMap * > *, JArray< jint > *); + virtual void mergeAttributes(::java::util::List *, JArray< jint > *); virtual void append(::java::text::AttributedCharacterIterator *); virtual void append(::java::lang::String *, ::java::util::HashMap *); virtual void append(::java::lang::String *); - virtual void addAttributes(::java::util::HashMap *, jint, jint); + virtual void addAttributes(::java::util::Map *, jint, jint); private: void debug(::java::lang::String *); void dumpTable(); @@ -68,7 +68,7 @@ private: jint charIndex; jint attributeIndex; JArray< jint > * ranges; - JArray< ::java::util::HashMap * > * attributes; + ::java::util::List * attributes; static const jboolean DEBUG = 0; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/java/text/StringFormatBuffer.h b/libjava/gnu/java/text/StringFormatBuffer.h index 9ee5bf8cb7e..945aa9becfe 100644 --- a/libjava/gnu/java/text/StringFormatBuffer.h +++ b/libjava/gnu/java/text/StringFormatBuffer.h @@ -38,7 +38,7 @@ public: StringFormatBuffer(::java::lang::StringBuffer *); virtual void append(::java::lang::String *); virtual void append(::java::lang::String *, ::java::text::AttributedCharacterIterator$Attribute *); - virtual void append(::java::lang::String *, JArray< jint > *, JArray< ::java::util::HashMap * > *); + virtual void append(::java::lang::String *, JArray< jint > *, ::java::util::List *); virtual void append(jchar); virtual void append(jchar, ::java::text::AttributedCharacterIterator$Attribute *); virtual void setDefaultAttribute(::java::text::AttributedCharacterIterator$Attribute *); |