diff options
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/MessageFormat.h | 10 | ||||
| -rw-r--r-- | libjava/java/text/RuleBasedCollator$CollationSorter.h | 3 | ||||
| -rw-r--r-- | libjava/java/text/RuleBasedCollator.h | 2 | ||||
| -rw-r--r-- | libjava/java/text/SimpleDateFormat.h | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/libjava/java/text/MessageFormat.h b/libjava/java/text/MessageFormat.h index 01c6c35..961b095 100644 --- a/libjava/java/text/MessageFormat.h +++ b/libjava/java/text/MessageFormat.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace text { class FormatCharacterIterator; @@ -38,9 +42,9 @@ extern "Java" class java::text::MessageFormat : public ::java::text::Format { - static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuilder *); - static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuilder *, jchar); - static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuilder *, ::java::util::Vector *, ::java::util::Locale *); + static jint scanString(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *); + static jint scanFormatElement(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *, jchar); + static jint scanFormat(::java::lang::String *, jint, ::gnu::java::lang::CPStringBuilder *, ::java::util::List *, ::java::util::Locale *); public: virtual void applyPattern(::java::lang::String *); virtual ::java::lang::Object * clone(); diff --git a/libjava/java/text/RuleBasedCollator$CollationSorter.h b/libjava/java/text/RuleBasedCollator$CollationSorter.h index 4436ec9..fb3d188 100644 --- a/libjava/java/text/RuleBasedCollator$CollationSorter.h +++ b/libjava/java/text/RuleBasedCollator$CollationSorter.h @@ -21,8 +21,9 @@ extern "Java" class java::text::RuleBasedCollator$CollationSorter : public ::java::lang::Object { + RuleBasedCollator$CollationSorter(jint, ::java::lang::String *, jint, jboolean); public: // actually package-private - RuleBasedCollator$CollationSorter(); + RuleBasedCollator$CollationSorter(jint, ::java::lang::String *, jint, jboolean, ::java::text::RuleBasedCollator$CollationSorter *); static const jint GREATERP = 0; static const jint GREATERS = 1; static const jint GREATERT = 2; diff --git a/libjava/java/text/RuleBasedCollator.h b/libjava/java/text/RuleBasedCollator.h index 06803c8..74b5aa8 100644 --- a/libjava/java/text/RuleBasedCollator.h +++ b/libjava/java/text/RuleBasedCollator.h @@ -54,7 +54,7 @@ public: virtual jint hashCode(); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Collator)))) rules; - JArray< ::java::lang::Object * > * ce_table; + JArray< ::java::text::RuleBasedCollator$CollationElement * > * ce_table; public: // actually package-private ::java::util::HashMap * prefix_tree; private: diff --git a/libjava/java/text/SimpleDateFormat.h b/libjava/java/text/SimpleDateFormat.h index 3e8a5d0..dbdb816 100644 --- a/libjava/java/text/SimpleDateFormat.h +++ b/libjava/java/text/SimpleDateFormat.h @@ -80,7 +80,7 @@ private: jint serialVersionOnStream; static const jlong serialVersionUID = 4774881970558875024LL; static ::java::lang::String * standardChars; - static const jint RFC822_TIMEZONE_FIELD = 18; + static const jint RFC822_TIMEZONE_FIELD = 23; public: static ::java::lang::Class class$; }; |