Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

34 files changed, 1960 insertions, 0 deletions

diff --git a/libjava/java/text/Annotation.h b/libjava/java/text/Annotation.h
new file mode 100644
index 00000000000..7170a3f91c3
--- /dev/null
+++ b/libjava/java/text/Annotation.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_Annotation__
+#define __java_text_Annotation__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Annotation;
+    }
+  }
+}
+
+class java::text::Annotation : public ::java::lang::Object
+{
+
+public:
+  Annotation(::java::lang::Object *);
+  virtual ::java::lang::Object * getValue();
+  virtual ::java::lang::String * toString();
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrib;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_Annotation__
diff --git a/libjava/java/text/AttributedCharacterIterator$Attribute.h b/libjava/java/text/AttributedCharacterIterator$Attribute.h
new file mode 100644
index 00000000000..f4722404425
--- /dev/null
+++ b/libjava/java/text/AttributedCharacterIterator$Attribute.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_AttributedCharacterIterator$Attribute__
+#define __java_text_AttributedCharacterIterator$Attribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator$Attribute;
+    }
+  }
+}
+
+class java::text::AttributedCharacterIterator$Attribute : public ::java::lang::Object
+{
+
+public: // actually protected
+  AttributedCharacterIterator$Attribute(::java::lang::String *);
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::Object * readResolve();
+public:
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -9142742483513960612LL;
+public:
+  static ::java::text::AttributedCharacterIterator$Attribute * LANGUAGE;
+  static ::java::text::AttributedCharacterIterator$Attribute * READING;
+  static ::java::text::AttributedCharacterIterator$Attribute * INPUT_METHOD_SEGMENT;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_AttributedCharacterIterator$Attribute__
diff --git a/libjava/java/text/AttributedCharacterIterator.h b/libjava/java/text/AttributedCharacterIterator.h
new file mode 100644
index 00000000000..c5b04f6fa94
--- /dev/null
+++ b/libjava/java/text/AttributedCharacterIterator.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_AttributedCharacterIterator__
+#define __java_text_AttributedCharacterIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class AttributedCharacterIterator$Attribute;
+    }
+  }
+}
+
+class java::text::AttributedCharacterIterator : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::util::Set * getAllAttributeKeys() = 0;
+  virtual ::java::util::Map * getAttributes() = 0;
+  virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *) = 0;
+  virtual jint getRunStart() = 0;
+  virtual jint getRunStart(::java::util::Set *) = 0;
+  virtual jint getRunStart(::java::text::AttributedCharacterIterator$Attribute *) = 0;
+  virtual jint getRunLimit() = 0;
+  virtual jint getRunLimit(::java::util::Set *) = 0;
+  virtual jint getRunLimit(::java::text::AttributedCharacterIterator$Attribute *) = 0;
+  virtual jchar current() = 0;
+  virtual jchar next() = 0;
+  virtual jchar previous() = 0;
+  virtual jchar first() = 0;
+  virtual jchar last() = 0;
+  virtual jint getIndex() = 0;
+  virtual jchar setIndex(jint) = 0;
+  virtual jint getBeginIndex() = 0;
+  virtual jint getEndIndex() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_text_AttributedCharacterIterator__
diff --git a/libjava/java/text/AttributedString$AttributeRange.h b/libjava/java/text/AttributedString$AttributeRange.h
new file mode 100644
index 00000000000..49e33d1ad08
--- /dev/null
+++ b/libjava/java/text/AttributedString$AttributeRange.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_AttributedString$AttributeRange__
+#define __java_text_AttributedString$AttributeRange__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedString;
+        class AttributedString$AttributeRange;
+    }
+  }
+}
+
+class java::text::AttributedString$AttributeRange : public ::java::lang::Object
+{
+
+public: // actually package-private
+  AttributedString$AttributeRange(::java::text::AttributedString *, ::java::util::Map *, jint, jint);
+  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attribs;
+  jint beginIndex;
+  jint endIndex;
+  ::java::text::AttributedString * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_AttributedString$AttributeRange__
diff --git a/libjava/java/text/AttributedString.h b/libjava/java/text/AttributedString.h
new file mode 100644
index 00000000000..51b4c0bc2fa
--- /dev/null
+++ b/libjava/java/text/AttributedString.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_AttributedString__
+#define __java_text_AttributedString__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class AttributedCharacterIterator$Attribute;
+        class AttributedString;
+        class AttributedString$AttributeRange;
+        class StringCharacterIterator;
+    }
+  }
+}
+
+class java::text::AttributedString : public ::java::lang::Object
+{
+
+public:
+  AttributedString(::java::lang::String *);
+  AttributedString(::java::lang::String *, ::java::util::Map *);
+  AttributedString(::java::text::AttributedCharacterIterator *);
+  AttributedString(::java::text::AttributedCharacterIterator *, jint, jint);
+  AttributedString(::java::text::AttributedCharacterIterator *, jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
+  virtual void addAttribute(::java::text::AttributedCharacterIterator$Attribute *, ::java::lang::Object *);
+  virtual void addAttribute(::java::text::AttributedCharacterIterator$Attribute *, ::java::lang::Object *, jint, jint);
+  virtual void addAttributes(::java::util::Map *, jint, jint);
+  virtual ::java::text::AttributedCharacterIterator * getIterator();
+  virtual ::java::text::AttributedCharacterIterator * getIterator(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
+  virtual ::java::text::AttributedCharacterIterator * getIterator(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *, jint, jint);
+private:
+  ::java::text::StringCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sci;
+  JArray< ::java::text::AttributedString$AttributeRange * > * attribs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_AttributedString__
diff --git a/libjava/java/text/AttributedStringIterator.h b/libjava/java/text/AttributedStringIterator.h
new file mode 100644
index 00000000000..bc2e77f89ab
--- /dev/null
+++ b/libjava/java/text/AttributedStringIterator.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_AttributedStringIterator__
+#define __java_text_AttributedStringIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator$Attribute;
+        class AttributedString$AttributeRange;
+        class AttributedStringIterator;
+        class CharacterIterator;
+        class StringCharacterIterator;
+    }
+  }
+}
+
+class java::text::AttributedStringIterator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  AttributedStringIterator(::java::text::StringCharacterIterator *, JArray< ::java::text::AttributedString$AttributeRange * > *, jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual jchar current();
+  virtual jchar next();
+  virtual jchar previous();
+  virtual jchar first();
+  virtual jchar last();
+  virtual jint getIndex();
+  virtual jchar setIndex(jint);
+  virtual jint getBeginIndex();
+  virtual jint getEndIndex();
+  virtual ::java::util::Set * getAllAttributeKeys();
+  virtual jint getRunLimit();
+  virtual jint getRunLimit(::java::text::AttributedCharacterIterator$Attribute *);
+  virtual jint getRunLimit(::java::util::Set *);
+  virtual jint getRunStart();
+  virtual jint getRunStart(::java::text::AttributedCharacterIterator$Attribute *);
+  virtual jint getRunStart(::java::util::Set *);
+private:
+  ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *, jint);
+public:
+  virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *);
+  virtual ::java::util::Map * getAttributes();
+private:
+  ::java::text::CharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ci;
+  JArray< ::java::text::AttributedString$AttributeRange * > * attribs;
+  JArray< ::java::text::AttributedCharacterIterator$Attribute * > * restricts;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_AttributedStringIterator__
diff --git a/libjava/java/text/Bidi.h b/libjava/java/text/Bidi.h
new file mode 100644
index 00000000000..59b80ed5a71
--- /dev/null
+++ b/libjava/java/text/Bidi.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_Bidi__
+#define __java_text_Bidi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class Bidi;
+    }
+  }
+}
+
+class java::text::Bidi : public ::java::lang::Object
+{
+
+public:
+  Bidi(::java::text::AttributedCharacterIterator *);
+  Bidi(JArray< jchar > *, jint, JArray< jbyte > *, jint, jint, jint);
+  Bidi(::java::lang::String *, jint);
+private:
+  void computeTypes();
+  jint computeParagraphEmbeddingLevel();
+  void computeExplicitLevels();
+  void computeRuns();
+  void resolveWeakTypes();
+  void resolveNeutralTypes();
+  void resolveImplicitLevels();
+  void reinsertFormattingCodes();
+  void runBidi();
+public:
+  jboolean baseIsLeftToRight();
+  ::java::text::Bidi * createLineBidi(jint, jint);
+  jint getBaseLevel();
+  jint getLength();
+  jint getLevelAt(jint);
+  jint getRunCount();
+  jint getRunLevel(jint);
+  jint getRunLimit(jint);
+  jint getRunStart(jint);
+  jboolean isLeftToRight();
+  jboolean isMixed();
+  jboolean isRightToLeft();
+  ::java::lang::String * toString();
+  static void reorderVisually(JArray< jbyte > *, jint, JArray< ::java::lang::Object * > *, jint, jint);
+  static jboolean requiresBidi(JArray< jchar > *, jint, jint);
+  static const jint DIRECTION_DEFAULT_LEFT_TO_RIGHT = -2;
+  static const jint DIRECTION_DEFAULT_RIGHT_TO_LEFT = -1;
+  static const jint DIRECTION_LEFT_TO_RIGHT = 0;
+  static const jint DIRECTION_RIGHT_TO_LEFT = 1;
+private:
+  static const jint LTOR = 1;
+  static const jint RTOL = 2;
+  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
+  jint textOffset;
+  JArray< jbyte > * embeddings;
+  jint embeddingOffset;
+  jint length;
+  jint flags;
+  jint baseEmbedding;
+  JArray< jbyte > * types;
+  JArray< jbyte > * levels;
+  ::java::util::ArrayList * formatterIndices;
+  JArray< jint > * runs;
+  jint resultFlags;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_Bidi__
diff --git a/libjava/java/text/BreakIterator.h b/libjava/java/text/BreakIterator.h
new file mode 100644
index 00000000000..2c6f90ea187
--- /dev/null
+++ b/libjava/java/text/BreakIterator.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_BreakIterator__
+#define __java_text_BreakIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class BreakIterator;
+        class CharacterIterator;
+    }
+  }
+}
+
+class java::text::BreakIterator : public ::java::lang::Object
+{
+
+public: // actually protected
+  BreakIterator();
+public:
+  virtual ::java::lang::Object * clone();
+  virtual jint current() = 0;
+  virtual jint first() = 0;
+  virtual jint following(jint) = 0;
+  static JArray< ::java::util::Locale * > * getAvailableLocales();
+private:
+  static ::java::text::BreakIterator * getInstance(::java::lang::String *, ::java::util::Locale *);
+public:
+  static ::java::text::BreakIterator * getCharacterInstance();
+  static ::java::text::BreakIterator * getCharacterInstance(::java::util::Locale *);
+  static ::java::text::BreakIterator * getLineInstance();
+  static ::java::text::BreakIterator * getLineInstance(::java::util::Locale *);
+  static ::java::text::BreakIterator * getSentenceInstance();
+  static ::java::text::BreakIterator * getSentenceInstance(::java::util::Locale *);
+  virtual ::java::text::CharacterIterator * getText() = 0;
+  static ::java::text::BreakIterator * getWordInstance();
+  static ::java::text::BreakIterator * getWordInstance(::java::util::Locale *);
+  virtual jboolean isBoundary(jint);
+  virtual jint last() = 0;
+  virtual jint next() = 0;
+  virtual jint next(jint) = 0;
+  virtual jint preceding(jint);
+  virtual jint previous() = 0;
+  virtual void setText(::java::lang::String *);
+  virtual void setText(::java::text::CharacterIterator *) = 0;
+  static const jint DONE = -1;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_BreakIterator__
diff --git a/libjava/java/text/CharacterIterator.h b/libjava/java/text/CharacterIterator.h
new file mode 100644
index 00000000000..d13612ff3bd
--- /dev/null
+++ b/libjava/java/text/CharacterIterator.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_CharacterIterator__
+#define __java_text_CharacterIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class CharacterIterator;
+    }
+  }
+}
+
+class java::text::CharacterIterator : public ::java::lang::Object
+{
+
+public:
+  virtual jchar current() = 0;
+  virtual jchar next() = 0;
+  virtual jchar previous() = 0;
+  virtual jchar first() = 0;
+  virtual jchar last() = 0;
+  virtual jint getIndex() = 0;
+  virtual jchar setIndex(jint) = 0;
+  virtual jint getBeginIndex() = 0;
+  virtual jint getEndIndex() = 0;
+  virtual ::java::lang::Object * clone() = 0;
+  static const jchar DONE = 65535;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_text_CharacterIterator__
diff --git a/libjava/java/text/ChoiceFormat.h b/libjava/java/text/ChoiceFormat.h
new file mode 100644
index 00000000000..30aa77a6788
--- /dev/null
+++ b/libjava/java/text/ChoiceFormat.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_ChoiceFormat__
+#define __java_text_ChoiceFormat__
+
+#pragma interface
+
+#include <java/text/NumberFormat.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class ChoiceFormat;
+        class FieldPosition;
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::ChoiceFormat : public ::java::text::NumberFormat
+{
+
+public:
+  virtual void applyPattern(::java::lang::String *);
+  ChoiceFormat(::java::lang::String *);
+  ChoiceFormat(JArray< jdouble > *, JArray< ::java::lang::String * > *);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual JArray< ::java::lang::Object * > * getFormats();
+  virtual JArray< jdouble > * getLimits();
+  virtual jint hashCode();
+  static jdouble nextDouble(jdouble);
+  static jdouble nextDouble(jdouble, jboolean);
+  virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *);
+  static jdouble previousDouble(jdouble);
+  virtual void setChoices(JArray< jdouble > *, JArray< ::java::lang::String * > *);
+private:
+  void quoteString(::java::lang::StringBuffer *, ::java::lang::String *);
+public:
+  virtual ::java::lang::String * toPattern();
+private:
+  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::text::NumberFormat)))) choiceFormats;
+  JArray< jdouble > * choiceLimits;
+  static const jint mantissaBits = 52;
+  static const jint exponentBits = 11;
+  static const jlong serialVersionUID = 1795184449645032964LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_ChoiceFormat__
diff --git a/libjava/java/text/CollationElementIterator.h b/libjava/java/text/CollationElementIterator.h
new file mode 100644
index 00000000000..19d92b8cab6
--- /dev/null
+++ b/libjava/java/text/CollationElementIterator.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_CollationElementIterator__
+#define __java_text_CollationElementIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class CharacterIterator;
+        class CollationElementIterator;
+        class RuleBasedCollator;
+        class RuleBasedCollator$CollationElement;
+    }
+  }
+}
+
+class java::text::CollationElementIterator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CollationElementIterator(::java::text::RuleBasedCollator *, ::java::lang::String *);
+  ::java::text::RuleBasedCollator$CollationElement * nextBlock();
+  ::java::text::RuleBasedCollator$CollationElement * previousBlock();
+public:
+  jint next();
+  jint previous();
+  static jint primaryOrder(jint);
+  void reset();
+  static jshort secondaryOrder(jint);
+  static jshort tertiaryOrder(jint);
+  void setText(::java::lang::String *);
+  void setText(::java::text::CharacterIterator *);
+  jint getOffset();
+  void setOffset(jint);
+  jint getMaxExpansion(jint);
+  static const jint NULLORDER = -1;
+public: // actually package-private
+  ::java::text::RuleBasedCollator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator;
+  ::java::lang::String * text;
+  jint index;
+  jint textIndex;
+private:
+  JArray< ::java::text::RuleBasedCollator$CollationElement * > * text_decomposition;
+  JArray< jint > * text_indexes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_CollationElementIterator__
diff --git a/libjava/java/text/CollationKey.h b/libjava/java/text/CollationKey.h
new file mode 100644
index 00000000000..83a6c5ae5dd
--- /dev/null
+++ b/libjava/java/text/CollationKey.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_CollationKey__
+#define __java_text_CollationKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class CollationKey;
+        class Collator;
+    }
+  }
+}
+
+class java::text::CollationKey : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CollationKey(::java::text::Collator *, ::java::lang::String *, JArray< jbyte > *);
+public:
+  virtual jint target$compareTo(::java::text::CollationKey *);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * getSourceString();
+  virtual jint hashCode();
+  virtual JArray< jbyte > * toByteArray();
+  virtual jint compareTo(::java::lang::Object *);
+private:
+  ::java::text::Collator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator;
+  ::java::lang::String * originalText;
+  JArray< jbyte > * key;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_CollationKey__
diff --git a/libjava/java/text/Collator.h b/libjava/java/text/Collator.h
new file mode 100644
index 00000000000..075dcb2b1d4
--- /dev/null
+++ b/libjava/java/text/Collator.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_Collator__
+#define __java_text_Collator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class CollationKey;
+        class Collator;
+    }
+  }
+}
+
+class java::text::Collator : public ::java::lang::Object
+{
+
+public: // actually protected
+  Collator();
+public:
+  virtual jint compare(::java::lang::String *, ::java::lang::String *) = 0;
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jboolean equals(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::Object * clone();
+  static JArray< ::java::util::Locale * > * getAvailableLocales();
+  virtual ::java::text::CollationKey * getCollationKey(::java::lang::String *) = 0;
+  virtual jint getDecomposition();
+  static ::java::text::Collator * getInstance();
+  static ::java::text::Collator * getInstance(::java::util::Locale *);
+  virtual jint getStrength();
+  virtual jint hashCode() = 0;
+  virtual void setDecomposition(jint);
+  virtual void setStrength(jint);
+public: // actually package-private
+  virtual void decomposeCharacter(jchar, ::java::lang::StringBuffer *);
+public:
+  static const jint PRIMARY = 0;
+  static const jint SECONDARY = 1;
+  static const jint TERTIARY = 2;
+  static const jint IDENTICAL = 3;
+  static const jint NO_DECOMPOSITION = 0;
+  static const jint CANONICAL_DECOMPOSITION = 1;
+  static const jint FULL_DECOMPOSITION = 2;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) decmp;
+  jint strength;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_Collator__
diff --git a/libjava/java/text/DateFormat$Field.h b/libjava/java/text/DateFormat$Field.h
new file mode 100644
index 00000000000..e586d22fe62
--- /dev/null
+++ b/libjava/java/text/DateFormat$Field.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_DateFormat$Field__
+#define __java_text_DateFormat$Field__
+
+#pragma interface
+
+#include <java/text/Format$Field.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DateFormat$Field;
+    }
+  }
+}
+
+class java::text::DateFormat$Field : public ::java::text::Format$Field
+{
+
+  DateFormat$Field();
+public: // actually protected
+  DateFormat$Field(::java::lang::String *, jint);
+public:
+  virtual jint getCalendarField();
+  static ::java::text::DateFormat$Field * ofCalendarField(jint);
+public: // actually protected
+  virtual ::java::lang::Object * readResolve();
+public: // actually package-private
+  static const jlong serialVersionUID = 7441350119349544720LL;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::text::Format$Field)))) calendarField;
+public:
+  static ::java::text::DateFormat$Field * ERA;
+  static ::java::text::DateFormat$Field * YEAR;
+  static ::java::text::DateFormat$Field * MONTH;
+  static ::java::text::DateFormat$Field * DAY_OF_MONTH;
+  static ::java::text::DateFormat$Field * HOUR_OF_DAY1;
+  static ::java::text::DateFormat$Field * HOUR_OF_DAY0;
+  static ::java::text::DateFormat$Field * MINUTE;
+  static ::java::text::DateFormat$Field * SECOND;
+  static ::java::text::DateFormat$Field * MILLISECOND;
+  static ::java::text::DateFormat$Field * DAY_OF_WEEK;
+  static ::java::text::DateFormat$Field * DAY_OF_YEAR;
+  static ::java::text::DateFormat$Field * DAY_OF_WEEK_IN_MONTH;
+  static ::java::text::DateFormat$Field * WEEK_OF_YEAR;
+  static ::java::text::DateFormat$Field * WEEK_OF_MONTH;
+  static ::java::text::DateFormat$Field * AM_PM;
+  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:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_DateFormat$Field__
diff --git a/libjava/java/text/DateFormat.h b/libjava/java/text/DateFormat.h
new file mode 100644
index 00000000000..447fef3b3ce
--- /dev/null
+++ b/libjava/java/text/DateFormat.h
@@ -0,0 +1,102 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_DateFormat__
+#define __java_text_DateFormat__
+
+#pragma interface
+
+#include <java/text/Format.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DateFormat;
+        class FieldPosition;
+        class NumberFormat;
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::DateFormat : public ::java::text::Format
+{
+
+public: // actually protected
+  DateFormat();
+public:
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::lang::String * format(::java::util::Date *);
+  virtual ::java::lang::StringBuffer * format(::java::util::Date *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
+  static JArray< ::java::util::Locale * > * getAvailableLocales();
+  virtual ::java::util::Calendar * getCalendar();
+private:
+  static ::java::text::DateFormat * computeInstance(jint, ::java::util::Locale *, jboolean, jboolean);
+  static ::java::text::DateFormat * computeInstance(jint, jint, ::java::util::Locale *, jboolean, jboolean);
+public:
+  static ::java::text::DateFormat * getDateInstance();
+  static ::java::text::DateFormat * getDateInstance(jint);
+  static ::java::text::DateFormat * getDateInstance(jint, ::java::util::Locale *);
+  static ::java::text::DateFormat * getDateTimeInstance();
+  static ::java::text::DateFormat * getDateTimeInstance(jint, jint);
+  static ::java::text::DateFormat * getDateTimeInstance(jint, jint, ::java::util::Locale *);
+  static ::java::text::DateFormat * getInstance();
+  virtual ::java::text::NumberFormat * getNumberFormat();
+  static ::java::text::DateFormat * getTimeInstance();
+  static ::java::text::DateFormat * getTimeInstance(jint);
+  static ::java::text::DateFormat * getTimeInstance(jint, ::java::util::Locale *);
+  virtual ::java::util::TimeZone * getTimeZone();
+  virtual jint hashCode();
+  virtual jboolean isLenient();
+  virtual ::java::util::Date * parse(::java::lang::String *);
+  virtual ::java::util::Date * parse(::java::lang::String *, ::java::text::ParsePosition *) = 0;
+  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
+  virtual void setCalendar(::java::util::Calendar *);
+  virtual void setLenient(jboolean);
+  virtual void setNumberFormat(::java::text::NumberFormat *);
+  virtual void setTimeZone(::java::util::TimeZone *);
+private:
+  static const jlong serialVersionUID = 7218322306649953788LL;
+public: // actually protected
+  ::java::util::Calendar * __attribute__((aligned(__alignof__( ::java::text::Format)))) calendar;
+  ::java::text::NumberFormat * numberFormat;
+public:
+  static const jint FULL = 0;
+  static const jint LONG = 1;
+  static const jint MEDIUM = 2;
+  static const jint SHORT = 3;
+  static const jint DEFAULT = 2;
+  static const jint ERA_FIELD = 0;
+  static const jint YEAR_FIELD = 1;
+  static const jint MONTH_FIELD = 2;
+  static const jint DATE_FIELD = 3;
+  static const jint HOUR_OF_DAY1_FIELD = 4;
+  static const jint HOUR_OF_DAY0_FIELD = 5;
+  static const jint MINUTE_FIELD = 6;
+  static const jint SECOND_FIELD = 7;
+  static const jint MILLISECOND_FIELD = 8;
+  static const jint DAY_OF_WEEK_FIELD = 9;
+  static const jint DAY_OF_YEAR_FIELD = 10;
+  static const jint DAY_OF_WEEK_IN_MONTH_FIELD = 11;
+  static const jint WEEK_OF_YEAR_FIELD = 12;
+  static const jint WEEK_OF_MONTH_FIELD = 13;
+  static const jint AM_PM_FIELD = 14;
+  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$;
+};
+
+#endif // __java_text_DateFormat__
diff --git a/libjava/java/text/DateFormatSymbols.h b/libjava/java/text/DateFormatSymbols.h
new file mode 100644
index 00000000000..1ef65b7cabd
--- /dev/null
+++ b/libjava/java/text/DateFormatSymbols.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_DateFormatSymbols__
+#define __java_text_DateFormatSymbols__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DateFormatSymbols;
+    }
+  }
+}
+
+class java::text::DateFormatSymbols : public ::java::lang::Object
+{
+
+  JArray< ::java::lang::String * > * formatsForKey(::java::util::ResourceBundle *, ::java::lang::String *);
+public:
+  DateFormatSymbols(::java::util::Locale *);
+  DateFormatSymbols();
+  virtual JArray< ::java::lang::String * > * getAmPmStrings();
+  virtual JArray< ::java::lang::String * > * getEras();
+  virtual ::java::lang::String * getLocalPatternChars();
+  virtual JArray< ::java::lang::String * > * getMonths();
+  virtual JArray< ::java::lang::String * > * getShortMonths();
+  virtual JArray< ::java::lang::String * > * getShortWeekdays();
+  virtual JArray< ::java::lang::String * > * getWeekdays();
+  virtual JArray< JArray< ::java::lang::String * > * > * getZoneStrings();
+  virtual void setAmPmStrings(JArray< ::java::lang::String * > *);
+  virtual void setEras(JArray< ::java::lang::String * > *);
+  virtual void setLocalPatternChars(::java::lang::String *);
+  virtual void setMonths(JArray< ::java::lang::String * > *);
+  virtual void setShortMonths(JArray< ::java::lang::String * > *);
+  virtual void setShortWeekdays(JArray< ::java::lang::String * > *);
+  virtual void setWeekdays(JArray< ::java::lang::String * > *);
+  virtual void setZoneStrings(JArray< JArray< ::java::lang::String * > * > *);
+private:
+  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
+  static jint hashCode(::java::lang::Object *);
+public:
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::Object * clone();
+  virtual jint hashCode();
+public: // actually package-private
+  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ampms;
+  JArray< ::java::lang::String * > * eras;
+private:
+  ::java::lang::String * localPatternChars;
+public: // actually package-private
+  JArray< ::java::lang::String * > * months;
+  JArray< ::java::lang::String * > * shortMonths;
+  JArray< ::java::lang::String * > * shortWeekdays;
+  JArray< ::java::lang::String * > * weekdays;
+private:
+  JArray< JArray< ::java::lang::String * > * > * zoneStrings;
+  static const jlong serialVersionUID = -5987973545549424702LL;
+  static JArray< ::java::lang::String * > * formatPrefixes;
+public: // actually package-private
+  JArray< ::java::lang::String * > * dateFormats;
+  JArray< ::java::lang::String * > * timeFormats;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_DateFormatSymbols__
diff --git a/libjava/java/text/DecimalFormat.h b/libjava/java/text/DecimalFormat.h
new file mode 100644
index 00000000000..14cf9d2f59b
--- /dev/null
+++ b/libjava/java/text/DecimalFormat.h
@@ -0,0 +1,120 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_DecimalFormat__
+#define __java_text_DecimalFormat__
+
+#pragma interface
+
+#include <java/text/NumberFormat.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigDecimal;
+    }
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class DecimalFormat;
+        class DecimalFormatSymbols;
+        class FieldPosition;
+        class NumberFormat$Field;
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::DecimalFormat : public ::java::text::NumberFormat
+{
+
+public:
+  DecimalFormat();
+  DecimalFormat(::java::lang::String *);
+  DecimalFormat(::java::lang::String *, ::java::text::DecimalFormatSymbols *);
+  virtual void applyLocalizedPattern(::java::lang::String *);
+  virtual void applyPattern(::java::lang::String *);
+  virtual ::java::lang::Object * clone();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
+  virtual ::java::util::Currency * getCurrency();
+  virtual ::java::text::DecimalFormatSymbols * getDecimalFormatSymbols();
+  virtual jint getGroupingSize();
+  virtual jint getMultiplier();
+  virtual ::java::lang::String * getNegativePrefix();
+  virtual ::java::lang::String * getNegativeSuffix();
+  virtual ::java::lang::String * getPositivePrefix();
+  virtual ::java::lang::String * getPositiveSuffix();
+  virtual jboolean isDecimalSeparatorAlwaysShown();
+  virtual void setParseBigDecimal(jboolean);
+  virtual jboolean isParseBigDecimal();
+  virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *);
+  virtual void setCurrency(::java::util::Currency *);
+  virtual void setDecimalFormatSymbols(::java::text::DecimalFormatSymbols *);
+  virtual void setDecimalSeparatorAlwaysShown(jboolean);
+  virtual void setGroupingSize(jint);
+  virtual void setMaximumIntegerDigits(jint);
+  virtual void setMinimumIntegerDigits(jint);
+  virtual void setMaximumFractionDigits(jint);
+  virtual void setMinimumFractionDigits(jint);
+  virtual void setMultiplier(jint);
+  virtual void setNegativePrefix(::java::lang::String *);
+  virtual void setNegativeSuffix(::java::lang::String *);
+  virtual void setPositivePrefix(::java::lang::String *);
+  virtual void setPositiveSuffix(::java::lang::String *);
+  virtual ::java::lang::String * toLocalizedPattern();
+  virtual ::java::lang::String * toPattern();
+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 *);
+  ::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);
+  jint scanNumberInteger(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
+  jint scanFractionalPortion(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
+  jint scanExponent(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
+  void scanNegativePattern(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
+  void formatInternal(::java::math::BigDecimal *, jboolean, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  void handleFractionalPart(::java::lang::StringBuffer *, ::java::lang::String *, ::java::text::FieldPosition *, jboolean);
+  void appendZero(::java::lang::StringBuffer *, jint, jint);
+  void appendDigit(::java::lang::String *, ::java::lang::StringBuffer *, jboolean);
+  jlong getExponent(::java::math::BigDecimal *);
+  ::java::lang::String * adjustTrailingZeros(::java::lang::String *, jint);
+  void addAttribute(::java::text::NumberFormat$Field *, jint, jint);
+  void setDefaultValues();
+  static const jlong serialVersionUID = 864413376551465018LL;
+  static const jint DEFAULT_INTEGER_DIGITS = 309;
+  static const jint DEFAULT_FRACTION_DIGITS = 340;
+  static ::java::text::DecimalFormatSymbols * nonLocalizedSymbols;
+  jboolean __attribute__((aligned(__alignof__( ::java::text::NumberFormat)))) parseBigDecimal;
+  jboolean useCurrencySeparator;
+  jboolean decimalSeparatorAlwaysShown;
+  jboolean showDecimalSeparator;
+  jboolean groupingSeparatorInPattern;
+  jbyte groupingSize;
+  jbyte minExponentDigits;
+  jint exponentRound;
+  jint multiplier;
+  jint negativePatternMultiplier;
+  ::java::lang::String * negativePrefix;
+  ::java::lang::String * negativeSuffix;
+  ::java::lang::String * positivePrefix;
+  ::java::lang::String * positiveSuffix;
+  ::java::text::DecimalFormatSymbols * symbols;
+  jboolean useExponentialNotation;
+  jint maxIntegerDigitsExponent;
+  jboolean hasNegativePrefix;
+  jboolean hasFractionalPattern;
+  ::java::util::ArrayList * attributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_DecimalFormat__
diff --git a/libjava/java/text/DecimalFormatSymbols.h b/libjava/java/text/DecimalFormatSymbols.h
new file mode 100644
index 00000000000..96bd2861693
--- /dev/null
+++ b/libjava/java/text/DecimalFormatSymbols.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_DecimalFormatSymbols__
+#define __java_text_DecimalFormatSymbols__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DecimalFormatSymbols;
+    }
+  }
+}
+
+class java::text::DecimalFormatSymbols : public ::java::lang::Object
+{
+
+public:
+  ::java::lang::Object * clone();
+  DecimalFormatSymbols();
+private:
+  ::java::lang::String * safeGetString(::java::util::ResourceBundle *, ::java::lang::String *, ::java::lang::String *);
+  jchar safeGetChar(::java::util::ResourceBundle *, ::java::lang::String *, jchar);
+public:
+  DecimalFormatSymbols(::java::util::Locale *);
+  jboolean equals(::java::lang::Object *);
+  ::java::util::Currency * getCurrency();
+  ::java::lang::String * getCurrencySymbol();
+  jchar getDecimalSeparator();
+  jchar getDigit();
+public: // actually package-private
+  jchar getExponential();
+public:
+  jchar getGroupingSeparator();
+  ::java::lang::String * getInfinity();
+  ::java::lang::String * getInternationalCurrencySymbol();
+  jchar getMinusSign();
+  jchar getMonetaryDecimalSeparator();
+  ::java::lang::String * getNaN();
+  jchar getPatternSeparator();
+  jchar getPercent();
+  jchar getPerMill();
+  jchar getZeroDigit();
+  jint hashCode();
+  void setCurrency(::java::util::Currency *);
+  void setCurrencySymbol(::java::lang::String *);
+  void setDecimalSeparator(jchar);
+  void setDigit(jchar);
+public: // actually package-private
+  void setExponential(jchar);
+public:
+  void setGroupingSeparator(jchar);
+  void setInfinity(::java::lang::String *);
+  void setInternationalCurrencySymbol(::java::lang::String *);
+  void setMinusSign(jchar);
+  void setMonetaryDecimalSeparator(jchar);
+  void setNaN(::java::lang::String *);
+  void setPatternSeparator(jchar);
+  void setPercent(jchar);
+  void setPerMill(jchar);
+  void setZeroDigit(jchar);
+private:
+  void readObject(::java::io::ObjectInputStream *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) currencySymbol;
+  jchar decimalSeparator;
+  jchar digit;
+  jchar exponential;
+  jchar groupingSeparator;
+  ::java::lang::String * infinity;
+  ::java::lang::String * intlCurrencySymbol;
+  jchar minusSign;
+  jchar monetarySeparator;
+  ::java::lang::String * NaN;
+  jchar patternSeparator;
+  jchar percent;
+  jchar perMill;
+  jint serialVersionOnStream;
+  jchar zeroDigit;
+  ::java::util::Locale * locale;
+  static const jlong serialVersionUID = 5772796243397350300LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_DecimalFormatSymbols__
diff --git a/libjava/java/text/FieldPosition.h b/libjava/java/text/FieldPosition.h
new file mode 100644
index 00000000000..d61f9115fcd
--- /dev/null
+++ b/libjava/java/text/FieldPosition.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_FieldPosition__
+#define __java_text_FieldPosition__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class FieldPosition;
+        class Format$Field;
+    }
+  }
+}
+
+class java::text::FieldPosition : public ::java::lang::Object
+{
+
+public:
+  FieldPosition(::java::text::Format$Field *);
+  FieldPosition(::java::text::Format$Field *, jint);
+  FieldPosition(jint);
+  virtual jint getField();
+  virtual ::java::text::Format$Field * getFieldAttribute();
+  virtual jint getBeginIndex();
+  virtual void setBeginIndex(jint);
+  virtual jint getEndIndex();
+  virtual void setEndIndex(jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::lang::String * toString();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) field_id;
+  jint begin;
+  jint end;
+  ::java::text::Format$Field * field_attribute;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_FieldPosition__
diff --git a/libjava/java/text/Format$Field.h b/libjava/java/text/Format$Field.h
new file mode 100644
index 00000000000..197dd7dce66
--- /dev/null
+++ b/libjava/java/text/Format$Field.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_Format$Field__
+#define __java_text_Format$Field__
+
+#pragma interface
+
+#include <java/text/AttributedCharacterIterator$Attribute.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Format$Field;
+    }
+  }
+}
+
+class java::text::Format$Field : public ::java::text::AttributedCharacterIterator$Attribute
+{
+
+public: // actually protected
+  Format$Field(::java::lang::String *);
+public: // actually package-private
+  static const jlong serialVersionUID = 276966692217360283LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_Format$Field__
diff --git a/libjava/java/text/Format.h b/libjava/java/text/Format.h
new file mode 100644
index 00000000000..5813bd0d40c
--- /dev/null
+++ b/libjava/java/text/Format.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_Format__
+#define __java_text_Format__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class FieldPosition;
+        class Format;
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::Format : public ::java::lang::Object
+{
+
+public:
+  Format();
+  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 *);
+  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *) = 0;
+  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  static const jlong serialVersionUID = -299282585814624189LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_Format__
diff --git a/libjava/java/text/MessageFormat$Field.h b/libjava/java/text/MessageFormat$Field.h
new file mode 100644
index 00000000000..78a9bebba91
--- /dev/null
+++ b/libjava/java/text/MessageFormat$Field.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_MessageFormat$Field__
+#define __java_text_MessageFormat$Field__
+
+#pragma interface
+
+#include <java/text/Format$Field.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class MessageFormat$Field;
+    }
+  }
+}
+
+class java::text::MessageFormat$Field : public ::java::text::Format$Field
+{
+
+  MessageFormat$Field();
+public: // actually protected
+  MessageFormat$Field(::java::lang::String *);
+  virtual ::java::lang::Object * readResolve();
+public: // actually package-private
+  static const jlong serialVersionUID = 7899943957617360810LL;
+public:
+  static ::java::text::MessageFormat$Field * ARGUMENT;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_MessageFormat$Field__
diff --git a/libjava/java/text/MessageFormat$MessageFormatElement.h b/libjava/java/text/MessageFormat$MessageFormatElement.h
new file mode 100644
index 00000000000..9a95f1f7f8e
--- /dev/null
+++ b/libjava/java/text/MessageFormat$MessageFormatElement.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_MessageFormat$MessageFormatElement__
+#define __java_text_MessageFormat$MessageFormatElement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Format;
+        class MessageFormat$MessageFormatElement;
+    }
+  }
+}
+
+class java::text::MessageFormat$MessageFormatElement : public ::java::lang::Object
+{
+
+  MessageFormat$MessageFormatElement();
+public: // actually package-private
+  void setLocale(::java::util::Locale *);
+  MessageFormat$MessageFormatElement(::java::text::MessageFormat$MessageFormatElement *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) argNumber;
+  ::java::text::Format * setFormat;
+  ::java::text::Format * format;
+  ::java::lang::Class * formatClass;
+  ::java::lang::String * type;
+  ::java::lang::String * style;
+  ::java::lang::String * trailer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_MessageFormat$MessageFormatElement__
diff --git a/libjava/java/text/MessageFormat.h b/libjava/java/text/MessageFormat.h
new file mode 100644
index 00000000000..47d476fb521
--- /dev/null
+++ b/libjava/java/text/MessageFormat.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_MessageFormat__
+#define __java_text_MessageFormat__
+
+#pragma interface
+
+#include <java/text/Format.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace text
+      {
+          class FormatCharacterIterator;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class FieldPosition;
+        class Format;
+        class MessageFormat;
+        class MessageFormat$MessageFormatElement;
+        class ParsePosition;
+    }
+  }
+}
+
+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 *);
+public:
+  virtual void applyPattern(::java::lang::String *);
+  virtual ::java::lang::Object * clone();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
+  static ::java::lang::String * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
+  virtual ::java::lang::StringBuffer * format(JArray< ::java::lang::Object * > *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+private:
+  ::java::lang::StringBuffer * formatInternal(JArray< ::java::lang::Object * > *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *, ::gnu::java::text::FormatCharacterIterator *);
+public:
+  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual JArray< ::java::text::Format * > * getFormats();
+  virtual ::java::util::Locale * getLocale();
+  virtual jint hashCode();
+private:
+  MessageFormat();
+public:
+  MessageFormat(::java::lang::String *);
+  MessageFormat(::java::lang::String *, ::java::util::Locale *);
+  virtual JArray< ::java::lang::Object * > * parse(::java::lang::String *, ::java::text::ParsePosition *);
+  virtual JArray< ::java::lang::Object * > * parse(::java::lang::String *);
+  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
+  virtual void setFormat(jint, ::java::text::Format *);
+  virtual void setFormats(JArray< ::java::text::Format * > *);
+  virtual void setLocale(::java::util::Locale *);
+  virtual ::java::lang::String * toPattern();
+  virtual JArray< ::java::text::Format * > * getFormatsByArgumentIndex();
+  virtual void setFormatByArgumentIndex(jint, ::java::text::Format *);
+  virtual void setFormatsByArgumentIndex(JArray< ::java::text::Format * > *);
+private:
+  static const jlong serialVersionUID = 6479157306784022952LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Format)))) pattern;
+  ::java::util::Locale * locale;
+  JArray< ::java::text::MessageFormat$MessageFormatElement * > * elements;
+  ::java::lang::String * leader;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_MessageFormat__
diff --git a/libjava/java/text/NumberFormat$Field.h b/libjava/java/text/NumberFormat$Field.h
new file mode 100644
index 00000000000..6b72af0a406
--- /dev/null
+++ b/libjava/java/text/NumberFormat$Field.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_NumberFormat$Field__
+#define __java_text_NumberFormat$Field__
+
+#pragma interface
+
+#include <java/text/Format$Field.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class NumberFormat$Field;
+    }
+  }
+}
+
+class java::text::NumberFormat$Field : public ::java::text::Format$Field
+{
+
+  NumberFormat$Field();
+public: // actually protected
+  NumberFormat$Field(::java::lang::String *);
+  virtual ::java::lang::Object * readResolve();
+public: // actually package-private
+  static const jlong serialVersionUID = 7494728892700160890LL;
+public:
+  static ::java::text::NumberFormat$Field * INTEGER;
+  static ::java::text::NumberFormat$Field * FRACTION;
+  static ::java::text::NumberFormat$Field * EXPONENT;
+  static ::java::text::NumberFormat$Field * DECIMAL_SEPARATOR;
+  static ::java::text::NumberFormat$Field * SIGN;
+  static ::java::text::NumberFormat$Field * GROUPING_SEPARATOR;
+  static ::java::text::NumberFormat$Field * EXPONENT_SYMBOL;
+  static ::java::text::NumberFormat$Field * PERCENT;
+  static ::java::text::NumberFormat$Field * PERMILLE;
+  static ::java::text::NumberFormat$Field * CURRENCY;
+  static ::java::text::NumberFormat$Field * EXPONENT_SIGN;
+private:
+  static JArray< ::java::text::NumberFormat$Field * > * allFields;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_NumberFormat$Field__
diff --git a/libjava/java/text/NumberFormat.h b/libjava/java/text/NumberFormat.h
new file mode 100644
index 00000000000..c800b99a97f
--- /dev/null
+++ b/libjava/java/text/NumberFormat.h
@@ -0,0 +1,100 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_NumberFormat__
+#define __java_text_NumberFormat__
+
+#pragma interface
+
+#include <java/text/Format.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class FieldPosition;
+        class NumberFormat;
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::NumberFormat : public ::java::text::Format
+{
+
+public:
+  virtual ::java::lang::String * format(jlong);
+  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
+  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
+  virtual jboolean equals(::java::lang::Object *);
+  static JArray< ::java::util::Locale * > * getAvailableLocales();
+private:
+  static ::java::text::NumberFormat * computeInstance(::java::util::Locale *, ::java::lang::String *, ::java::lang::String *);
+public:
+  static ::java::text::NumberFormat * getCurrencyInstance();
+  static ::java::text::NumberFormat * getCurrencyInstance(::java::util::Locale *);
+  static ::java::text::NumberFormat * getInstance();
+  static ::java::text::NumberFormat * getInstance(::java::util::Locale *);
+  virtual jint getMaximumFractionDigits();
+  virtual jint getMaximumIntegerDigits();
+  virtual jint getMinimumFractionDigits();
+  virtual jint getMinimumIntegerDigits();
+  static ::java::text::NumberFormat * getNumberInstance();
+  static ::java::text::NumberFormat * getNumberInstance(::java::util::Locale *);
+  static ::java::text::NumberFormat * getIntegerInstance();
+  static ::java::text::NumberFormat * getIntegerInstance(::java::util::Locale *);
+  static ::java::text::NumberFormat * getPercentInstance();
+  static ::java::text::NumberFormat * getPercentInstance(::java::util::Locale *);
+  virtual jint hashCode();
+  virtual jboolean isGroupingUsed();
+  virtual jboolean isParseIntegerOnly();
+  NumberFormat();
+  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 *);
+  virtual void setGroupingUsed(jboolean);
+  virtual void setMaximumFractionDigits(jint);
+  virtual void setMaximumIntegerDigits(jint);
+  virtual void setMinimumFractionDigits(jint);
+  virtual void setMinimumIntegerDigits(jint);
+  virtual void setParseIntegerOnly(jboolean);
+  virtual ::java::lang::String * format(jdouble);
+private:
+  void readObject(::java::io::ObjectInputStream *);
+  void writeObject(::java::io::ObjectOutputStream *);
+public:
+  virtual ::java::util::Currency * getCurrency();
+  virtual void setCurrency(::java::util::Currency *);
+  static const jint INTEGER_FIELD = 0;
+  static const jint FRACTION_FIELD = 1;
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::java::text::Format)))) groupingUsed;
+  jint maximumFractionDigits;
+private:
+  jbyte maxFractionDigits;
+public: // actually package-private
+  jint maximumIntegerDigits;
+private:
+  jbyte maxIntegerDigits;
+public: // actually package-private
+  jint minimumFractionDigits;
+private:
+  jbyte minFractionDigits;
+public: // actually package-private
+  jint minimumIntegerDigits;
+private:
+  jbyte minIntegerDigits;
+public: // actually package-private
+  jboolean parseIntegerOnly;
+private:
+  jint serialVersionOnStream;
+  static const jlong serialVersionUID = -2308460125733713944LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_NumberFormat__
diff --git a/libjava/java/text/ParseException.h b/libjava/java/text/ParseException.h
new file mode 100644
index 00000000000..e8b314fa2d1
--- /dev/null
+++ b/libjava/java/text/ParseException.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_ParseException__
+#define __java_text_ParseException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class ParseException;
+    }
+  }
+}
+
+class java::text::ParseException : public ::java::lang::Exception
+{
+
+public:
+  ParseException(::java::lang::String *, jint);
+  virtual jint getErrorOffset();
+private:
+  static const jlong serialVersionUID = 2703218443322787634LL;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorOffset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_ParseException__
diff --git a/libjava/java/text/ParsePosition.h b/libjava/java/text/ParsePosition.h
new file mode 100644
index 00000000000..4f7970cea94
--- /dev/null
+++ b/libjava/java/text/ParsePosition.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_ParsePosition__
+#define __java_text_ParsePosition__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class ParsePosition;
+    }
+  }
+}
+
+class java::text::ParsePosition : public ::java::lang::Object
+{
+
+public:
+  ParsePosition(jint);
+  virtual jint getIndex();
+  virtual void setIndex(jint);
+  virtual jint getErrorIndex();
+  virtual void setErrorIndex(jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::lang::String * toString();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
+  jint error_index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_ParsePosition__
diff --git a/libjava/java/text/RuleBasedCollator$CollationElement.h b/libjava/java/text/RuleBasedCollator$CollationElement.h
new file mode 100644
index 00000000000..8baa2a46d84
--- /dev/null
+++ b/libjava/java/text/RuleBasedCollator$CollationElement.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_RuleBasedCollator$CollationElement__
+#define __java_text_RuleBasedCollator$CollationElement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class RuleBasedCollator$CollationElement;
+    }
+  }
+}
+
+class java::text::RuleBasedCollator$CollationElement : public ::java::lang::Object
+{
+
+public: // actually package-private
+  RuleBasedCollator$CollationElement(::java::lang::String *, jint, jshort, jshort, jshort, ::java::lang::String *, jboolean);
+  jint getValue();
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  jint primary;
+  jshort secondary;
+  jshort tertiary;
+  jshort equality;
+  jboolean ignore;
+  ::java::lang::String * expansion;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_RuleBasedCollator$CollationElement__
diff --git a/libjava/java/text/RuleBasedCollator$CollationSorter.h b/libjava/java/text/RuleBasedCollator$CollationSorter.h
new file mode 100644
index 00000000000..4436ec955bc
--- /dev/null
+++ b/libjava/java/text/RuleBasedCollator$CollationSorter.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_RuleBasedCollator$CollationSorter__
+#define __java_text_RuleBasedCollator$CollationSorter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class RuleBasedCollator$CollationSorter;
+    }
+  }
+}
+
+class java::text::RuleBasedCollator$CollationSorter : public ::java::lang::Object
+{
+
+public: // actually package-private
+  RuleBasedCollator$CollationSorter();
+  static const jint GREATERP = 0;
+  static const jint GREATERS = 1;
+  static const jint GREATERT = 2;
+  static const jint EQUAL = 3;
+  static const jint RESET = 4;
+  static const jint INVERSE_SECONDARY = 5;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) comparisonType;
+  ::java::lang::String * textElement;
+  jint hashText;
+  jint offset;
+  jboolean ignore;
+  ::java::lang::String * expansionOrdering;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_RuleBasedCollator$CollationSorter__
diff --git a/libjava/java/text/RuleBasedCollator.h b/libjava/java/text/RuleBasedCollator.h
new file mode 100644
index 00000000000..06803c8514a
--- /dev/null
+++ b/libjava/java/text/RuleBasedCollator.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_RuleBasedCollator__
+#define __java_text_RuleBasedCollator__
+
+#pragma interface
+
+#include <java/text/Collator.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class CharacterIterator;
+        class CollationElementIterator;
+        class CollationKey;
+        class RuleBasedCollator;
+        class RuleBasedCollator$CollationElement;
+    }
+  }
+}
+
+class java::text::RuleBasedCollator : public ::java::text::Collator
+{
+
+public:
+  RuleBasedCollator(::java::lang::String *);
+public: // actually package-private
+  static jint findPrefixLength(::java::lang::String *, ::java::lang::String *);
+private:
+  void mergeRules(jint, ::java::lang::String *, ::java::util::ArrayList *, ::java::util::ArrayList *);
+  jint subParseString(jboolean, ::java::util::ArrayList *, jint, ::java::lang::String *);
+public:
+  virtual ::java::lang::Object * clone();
+private:
+  ::java::util::ArrayList * parseString(::java::lang::String *);
+  void buildCollationVector(::java::util::ArrayList *);
+  void buildPrefixAccess();
+public:
+  virtual jint compare(::java::lang::String *, ::java::lang::String *);
+  virtual jboolean equals(::java::lang::Object *);
+public: // actually package-private
+  virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultElement(jchar);
+  virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultAccentedElement(jchar);
+public:
+  virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::lang::String *);
+  virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::text::CharacterIterator *);
+  virtual ::java::text::CollationKey * getCollationKey(::java::lang::String *);
+  virtual ::java::lang::String * getRules();
+  virtual jint hashCode();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Collator)))) rules;
+  JArray< ::java::lang::Object * > * ce_table;
+public: // actually package-private
+  ::java::util::HashMap * prefix_tree;
+private:
+  jint last_primary_value;
+  jint last_tertiary_value;
+  jboolean inverseAccentComparison;
+public: // actually package-private
+  static ::java::text::RuleBasedCollator$CollationElement * SPECIAL_UNKNOWN_SEQ;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_RuleBasedCollator__
diff --git a/libjava/java/text/SimpleDateFormat$CompiledField.h b/libjava/java/text/SimpleDateFormat$CompiledField.h
new file mode 100644
index 00000000000..b188792018a
--- /dev/null
+++ b/libjava/java/text/SimpleDateFormat$CompiledField.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_SimpleDateFormat$CompiledField__
+#define __java_text_SimpleDateFormat$CompiledField__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class SimpleDateFormat;
+        class SimpleDateFormat$CompiledField;
+    }
+  }
+}
+
+class java::text::SimpleDateFormat$CompiledField : public ::java::lang::Object
+{
+
+public:
+  SimpleDateFormat$CompiledField(::java::text::SimpleDateFormat *, jint, jint, jchar);
+  virtual jint getField();
+  virtual jint getSize();
+  virtual jchar getCharacter();
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) field;
+  jint size;
+private:
+  jchar character;
+public: // actually package-private
+  ::java::text::SimpleDateFormat * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_SimpleDateFormat$CompiledField__
diff --git a/libjava/java/text/SimpleDateFormat.h b/libjava/java/text/SimpleDateFormat.h
new file mode 100644
index 00000000000..a6ffbf50718
--- /dev/null
+++ b/libjava/java/text/SimpleDateFormat.h
@@ -0,0 +1,87 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_SimpleDateFormat__
+#define __java_text_SimpleDateFormat__
+
+#pragma interface
+
+#include <java/text/DateFormat.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace text
+      {
+          class FormatBuffer;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace text
+    {
+        class AttributedCharacterIterator;
+        class DateFormatSymbols;
+        class FieldPosition;
+        class ParsePosition;
+        class SimpleDateFormat;
+    }
+  }
+}
+
+class java::text::SimpleDateFormat : public ::java::text::DateFormat
+{
+
+  void readObject(::java::io::ObjectInputStream *);
+  void compileFormat(::java::lang::String *);
+public:
+  virtual ::java::lang::String * toString();
+  SimpleDateFormat();
+  SimpleDateFormat(::java::lang::String *);
+  SimpleDateFormat(::java::lang::String *, ::java::util::Locale *);
+  SimpleDateFormat(::java::lang::String *, ::java::text::DateFormatSymbols *);
+  virtual ::java::lang::String * toPattern();
+  virtual ::java::lang::String * toLocalizedPattern();
+  virtual void applyPattern(::java::lang::String *);
+  virtual void applyLocalizedPattern(::java::lang::String *);
+private:
+  ::java::lang::String * translateLocalizedPattern(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
+public:
+  virtual ::java::util::Date * get2DigitYearStart();
+  virtual void set2DigitYearStart(::java::util::Date *);
+  virtual ::java::text::DateFormatSymbols * getDateFormatSymbols();
+  virtual void setDateFormatSymbols(::java::text::DateFormatSymbols *);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+private:
+  void formatWithAttribute(::java::util::Date *, ::gnu::java::text::FormatBuffer *, ::java::text::FieldPosition *);
+public:
+  virtual ::java::lang::StringBuffer * format(::java::util::Date *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
+  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
+private:
+  void withLeadingZeros(jint, jint, ::gnu::java::text::FormatBuffer *);
+  jboolean expect(::java::lang::String *, ::java::text::ParsePosition *, jchar);
+public:
+  virtual ::java::util::Date * parse(::java::lang::String *, ::java::text::ParsePosition *);
+private:
+  ::java::lang::Integer * computeOffset(::java::lang::String *, ::java::text::ParsePosition *);
+  void computeCenturyStart();
+public:
+  virtual ::java::lang::Object * clone();
+private:
+  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::text::DateFormat)))) tokens;
+  ::java::text::DateFormatSymbols * formatData;
+  ::java::util::Date * defaultCenturyStart;
+  jint defaultCentury;
+  ::java::lang::String * pattern;
+  jint serialVersionOnStream;
+  static const jlong serialVersionUID = 4774881970558875024LL;
+  static ::java::lang::String * standardChars;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_SimpleDateFormat__
diff --git a/libjava/java/text/StringCharacterIterator.h b/libjava/java/text/StringCharacterIterator.h
new file mode 100644
index 00000000000..d1769635609
--- /dev/null
+++ b/libjava/java/text/StringCharacterIterator.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_text_StringCharacterIterator__
+#define __java_text_StringCharacterIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class StringCharacterIterator;
+    }
+  }
+}
+
+class java::text::StringCharacterIterator : public ::java::lang::Object
+{
+
+public:
+  StringCharacterIterator(::java::lang::String *);
+  StringCharacterIterator(::java::lang::String *, jint);
+  StringCharacterIterator(::java::lang::String *, jint, jint, jint);
+public: // actually package-private
+  StringCharacterIterator(::java::text::StringCharacterIterator *, jint, jint);
+public:
+  jchar current();
+  jchar next();
+  jchar previous();
+  jchar first();
+  jchar last();
+  jint getIndex();
+  jchar setIndex(jint);
+  jint getBeginIndex();
+  jint getEndIndex();
+  ::java::lang::Object * clone();
+  jboolean equals(::java::lang::Object *);
+  jint hashCode();
+  void setText(::java::lang::String *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
+  jint begin;
+  jint end;
+  jint index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_text_StringCharacterIterator__