9 files changed, 31 insertions, 18 deletions
diff --git a/libjava/java/text/ChoiceFormat.h b/libjava/java/text/ChoiceFormat.h
index 30aa77a..92852eb 100644
--- a/libjava/java/text/ChoiceFormat.h
+++ b/libjava/java/text/ChoiceFormat.h
@@ -11,6 +11,16 @@
 
 extern "Java"
 {
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace lang
+      {
+          class CPStringBuilder;
+      }
+    }
+  }
   namespace java
   {
     namespace text
@@ -41,7 +51,7 @@ public:
   static jdouble previousDouble(jdouble);
   virtual void setChoices(JArray< jdouble > *, JArray< ::java::lang::String * > *);
 private:
-  void quoteString(::java::lang::StringBuffer *, ::java::lang::String *);
+  void quoteString(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *);
 public:
   virtual ::java::lang::String * toPattern();
 private:
diff --git a/libjava/java/text/DateFormat$Field.h b/libjava/java/text/DateFormat$Field.h
index e586d22..4748047 100644
--- a/libjava/java/text/DateFormat$Field.h
+++ b/libjava/java/text/DateFormat$Field.h
@@ -54,12 +54,6 @@ public:
   static ::java::text::DateFormat$Field * HOUR1;
   static ::java::text::DateFormat$Field * HOUR0;
   static ::java::text::DateFormat$Field * TIME_ZONE;
-  static ::java::text::DateFormat$Field * ISO_YEAR;
-  static ::java::text::DateFormat$Field * LOCALIZED_DAY_OF_WEEK;
-  static ::java::text::DateFormat$Field * EXTENDED_YEAR;
-  static ::java::text::DateFormat$Field * MODIFIED_JULIAN_DAY;
-  static ::java::text::DateFormat$Field * MILLISECOND_IN_DAY;
-  static ::java::text::DateFormat$Field * RFC822_TIME_ZONE;
 public: // actually package-private
   static JArray< ::java::text::DateFormat$Field * > * allFields;
 public:
diff --git a/libjava/java/text/DateFormat.h b/libjava/java/text/DateFormat.h
index 7f82499..5f5241f 100644
--- a/libjava/java/text/DateFormat.h
+++ b/libjava/java/text/DateFormat.h
@@ -91,12 +91,6 @@ public:
   static const jint HOUR1_FIELD = 15;
   static const jint HOUR0_FIELD = 16;
   static const jint TIMEZONE_FIELD = 17;
-  static const jint ISO_YEAR_FIELD = 18;
-  static const jint LOCALIZED_DAY_OF_WEEK_FIELD = 19;
-  static const jint EXTENDED_YEAR_FIELD = 20;
-  static const jint MODIFIED_JULIAN_DAY_FIELD = 21;
-  static const jint MILLISECOND_IN_DAY_FIELD = 22;
-  static const jint RFC822_TIMEZONE_FIELD = 23;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/java/text/DateFormatSymbols.h b/libjava/java/text/DateFormatSymbols.h
index d1f25b3..b5cce7f 100644
--- a/libjava/java/text/DateFormatSymbols.h
+++ b/libjava/java/text/DateFormatSymbols.h
@@ -65,6 +65,7 @@ public: // actually package-private
   JArray< ::java::lang::String * > * shortWeekdays;
   JArray< ::java::lang::String * > * weekdays;
 private:
+  static ::java::util::Properties * properties;
   JArray< JArray< ::java::lang::String * > * > * runtimeZoneStrings;
   JArray< JArray< ::java::lang::String * > * > * zoneStrings;
   static const jlong serialVersionUID = -5987973545549424702LL;
diff --git a/libjava/java/text/DecimalFormat.h b/libjava/java/text/DecimalFormat.h
index 14cf9d2..a3172d7 100644
--- a/libjava/java/text/DecimalFormat.h
+++ b/libjava/java/text/DecimalFormat.h
@@ -9,6 +9,16 @@
 #include <java/text/NumberFormat.h>
 extern "Java"
 {
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace lang
+      {
+          class CPStringBuilder;
+      }
+    }
+  }
   namespace java
   {
     namespace math
@@ -73,7 +83,7 @@ public:
 private:
   jboolean equals(::java::lang::String *, ::java::lang::String *);
   ::java::lang::String * patternChars(::java::text::DecimalFormatSymbols *);
-  ::java::lang::StringBuffer * quoteFix(::java::lang::String *, ::java::lang::String *);
+  ::gnu::java::lang::CPStringBuilder * quoteFix(::java::lang::String *, ::java::lang::String *);
   ::java::lang::String * computePattern(::java::text::DecimalFormatSymbols *);
   void applyPatternWithSymbols(::java::lang::String *, ::java::text::DecimalFormatSymbols *);
   jint scanFix(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint, jboolean);
diff --git a/libjava/java/text/Format.h b/libjava/java/text/Format.h
index 5813bd0..a0b6d51 100644
--- a/libjava/java/text/Format.h
+++ b/libjava/java/text/Format.h
@@ -24,8 +24,9 @@ extern "Java"
 class java::text::Format : public ::java::lang::Object
 {
 
-public:
+public: // actually protected
   Format();
+public:
   virtual ::java::lang::String * format(::java::lang::Object *);
   virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
   virtual ::java::lang::Object * parseObject(::java::lang::String *);
diff --git a/libjava/java/text/MessageFormat.h b/libjava/java/text/MessageFormat.h
index 47d476f..01c6c35 100644
--- a/libjava/java/text/MessageFormat.h
+++ b/libjava/java/text/MessageFormat.h
@@ -38,9 +38,9 @@ extern "Java"
 class java::text::MessageFormat : public ::java::text::Format
 {
 
-  static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuffer *);
-  static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuffer *, jchar);
-  static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuffer *, ::java::util::Vector *, ::java::util::Locale *);
+  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 *);
 public:
   virtual void applyPattern(::java::lang::String *);
   virtual ::java::lang::Object * clone();
diff --git a/libjava/java/text/NumberFormat.h b/libjava/java/text/NumberFormat.h
index c800b99..0b480da 100644
--- a/libjava/java/text/NumberFormat.h
+++ b/libjava/java/text/NumberFormat.h
@@ -52,7 +52,9 @@ public:
   virtual jint hashCode();
   virtual jboolean isGroupingUsed();
   virtual jboolean isParseIntegerOnly();
+public: // actually protected
   NumberFormat();
+public:
   virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *) = 0;
   virtual ::java::lang::Number * parse(::java::lang::String *);
   virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
diff --git a/libjava/java/text/SimpleDateFormat.h b/libjava/java/text/SimpleDateFormat.h
index a6ffbf5..3e8a5d0 100644
--- a/libjava/java/text/SimpleDateFormat.h
+++ b/libjava/java/text/SimpleDateFormat.h
@@ -80,6 +80,7 @@ private:
   jint serialVersionOnStream;
   static const jlong serialVersionUID = 4774881970558875024LL;
   static ::java::lang::String * standardChars;
+  static const jint RFC822_TIMEZONE_FIELD = 18;
 public:
   static ::java::lang::Class class$;
 };