From a1906e8bbfa426ed1adfe751608bc74f1d4d2ab7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 19 Dec 2012 17:03:15 +0000 Subject: Import GNU Classpath (20121202). 2012-12-19 Matthias Klose Import GNU Classpath (20121202). * Regenerate class and header files. * Regenerate auto* files. * sources.am, gcj/javaprims.h: Regenerate. * gnu/java/nio/FileLockImpl.java (close): New override. From-SVN: r194618 --- libjava/gnu/java/text/AttributedFormatBuffer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libjava/gnu/java/text/AttributedFormatBuffer.h') 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; -- cgit v1.2.3